commit 86a9b20b1a2cd3a1c61f9ac30d207494f0bb2da5
parent b5b7cc89d5cef9ea429fa04c5a8ff09770c10fd6
Author: Andrej Kacian <ticho@claws-mail.org>
Date: Wed, 17 Feb 2010 10:09:08 +0000
2010-02-17 [ticho] 3.7.5cvs20
* src/summaryview.c
* src/summaryview.h
* src/toolbar.c
Revert 3.7.5cvs19.
Diffstat:
6 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-17 [ticho] 3.7.5cvs20
+
+ * src/summaryview.c
+ * src/summaryview.h
+ * src/toolbar.c
+ Revert 3.7.5cvs19.
+
2010-02-16 [ticho] 3.7.5cvs19
* src/summaryview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3960,3 +3960,4 @@
( cvs diff -u -r 1.43.2.83 -r 1.43.2.84 src/prefs_matcher.c; ) > 3.7.5cvs17.patchset
( cvs diff -u -r 1.382.2.545 -r 1.382.2.546 src/compose.c; cvs diff -u -r 1.12.2.73 -r 1.12.2.74 src/prefs_template.c; ) > 3.7.5cvs18.patchset
( cvs diff -u -r 1.395.2.417 -r 1.395.2.418 src/summaryview.c; cvs diff -u -r 1.68.2.53 -r 1.68.2.54 src/summaryview.h; cvs diff -u -r 1.43.2.113 -r 1.43.2.114 src/toolbar.c; ) > 3.7.5cvs19.patchset
+( cvs diff -u -r 1.395.2.418 -r 1.395.2.419 src/summaryview.c; cvs diff -u -r 1.68.2.54 -r 1.68.2.55 src/summaryview.h; cvs diff -u -r 1.43.2.114 -r 1.43.2.115 src/toolbar.c; ) > 3.7.5cvs20.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=5
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=19
+EXTRA_VERSION=20
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -6571,7 +6571,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
summary_display_msg(summaryview,
summaryview->selected);
#else
- summary_open_row(summaryview);
+ summary_open_row(NULL, summaryview);
#endif
break;
}
@@ -6685,7 +6685,7 @@ void summaryview_activate_quicksearch(SummaryView *summaryview, gboolean show)
}
}
-void summary_open_row(SummaryView *summaryview)
+void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
{
if (FOLDER_SHOWS_TO_HDR(summaryview->folder_item))
summary_reedit(summaryview);
diff --git a/src/summaryview.h b/src/summaryview.h
@@ -250,7 +250,7 @@ void summary_display_msg_selected (SummaryView *summaryview,
gboolean all_headers);
void summary_redisplay_msg (SummaryView *summaryview);
void summary_open_msg (SummaryView *summaryview);
-void summary_open_row (SummaryView *summaryview);
+void summary_open_row (GtkSCTree *sctree, SummaryView *summaryview);
void summary_view_source (SummaryView *summaryview);
void summary_reedit (SummaryView *summaryview);
gboolean summary_step (SummaryView *summaryview,
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -1540,7 +1540,7 @@ static void toolbar_open_mail_cb(GtkWidget *widget, gpointer data)
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
mainwin = (MainWindow *) toolbar_item->parent;
- summary_open_row(mainwin->summaryview);
+ summary_open_row(NULL, mainwin->summaryview);
break;
case TOOLBAR_MSGVIEW:
debug_print("toolbar event not supported\n");