commit d09f676f46a546f6c6880a8a7d4220c835f4d0b8
parent c3e4f8328b13cf0866dd68bdce3864000529b42a
Author: Colin Leroy <colin@colino.net>
Date: Thu, 15 Nov 2012 15:23:13 +0000
2012-11-15 [colin] 3.9.0cvs6
* src/summaryview.c
Fix bug #2785, "Marking mails for deletion reopens internal
message view"
Diffstat:
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-15 [colin] 3.9.0cvs6
+
+ * src/summaryview.c
+ Fix bug #2785, "Marking mails for deletion reopens internal
+ message view"
+
2012-11-15 [colin] 3.9.0cvs5
* src/main.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4503,3 +4503,4 @@
( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 doc/man/claws-mail.1; cvs diff -u -r 1.115.2.259 -r 1.115.2.260 src/main.c; ) > 3.9.0cvs3.patchset
( cvs diff -u -r 1.155.2.103 -r 1.155.2.104 src/Makefile.am; cvs diff -u -r 1.12.2.77 -r 1.12.2.78 src/action.c; cvs diff -u -r 1.27.2.65 -r 1.27.2.66 src/addr_compl.c; cvs diff -u -r 1.60.2.152 -r 1.60.2.153 src/addressbook.c; cvs diff -u -r 1.5.10.39 -r 1.5.10.40 src/addrgather.c; cvs diff -u -r 1.382.2.617 -r 1.382.2.618 src/compose.c; cvs diff -u -r 1.14.2.65 -r 1.14.2.66 src/editaddress.c; cvs diff -u -r 1.11.2.30 -r 1.11.2.31 src/editgroup.c; cvs diff -u -r 1.115.2.260 -r 1.115.2.261 src/main.c; cvs diff -u -r 1.274.2.354 -r 1.274.2.355 src/mainwindow.c; cvs diff -u -r 1.3.12.43 -r 1.3.12.44 src/message_search.c; cvs diff -u -r 1.16.2.46 -r 1.16.2.47 src/prefs_display_header.c; cvs diff -u -r 1.1.4.79 -r 1.1.4.80 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.96 -r 1.43.2.97 src/prefs_matcher.c; cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/prefs_other.c; cvs diff -u -r 1.30.2.75 -r 1.30.2.76 src/prefs_toolbar.c; cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/printing.c; cvs diff -u -r 1.25.2.76 -r 1.25.2.77 src/stock_pixmap.c; cvs diff -u -r 1.15.2.74 -r 1.15.2.75 src/summary_search.c; cvs diff -u -r 1.395.2.456 -r 1.395.2.457 src/summaryview.c; cvs diff -u -r 1.96.2.254 -r 1.96.2.255 src/textview.c; cvs diff -u -r 1.20.2.28 -r 1.20.2.29 src/gtk/Makefile.am; cvs diff -u -r 1.2.2.37 -r 1.2.2.38 src/gtk/colorlabel.c; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/gtk/combobox.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/gtk/combobox.h; cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/gtk/gtkcmclist.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/gtkcmclist.h; cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/gtk/gtkcmctree.c; cvs diff -u -r 1.1.4.65 -r 1.1.4.66 src/gtk/gtksctree.c; cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/gtk/gtkshruler.c; cvs diff -u -r 1.5.2.105 -r 1.5.2.106 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.67 -r 1.4.2.68 src/gtk/gtkutils.h; cvs diff -u -r 1.2.2.48 -r 1.2.2.49 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.119 -r 1.1.2.120 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpcore/Makefile.am; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpinline/Makefile.am; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpmime/Makefile.am; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/smime/Makefile.am; ) > 3.9.0cvs4.patchset
( cvs diff -u -r 1.115.2.261 -r 1.115.2.262 src/main.c; cvs diff -u -r 1.5.2.33 -r 1.5.2.34 src/statusbar.c; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/gtk/gtkcmclist.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/gtkcmclist.h; ) > 3.9.0cvs5.patchset
+( cvs diff -u -r 1.395.2.457 -r 1.395.2.458 src/summaryview.c; ) > 3.9.0cvs6.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -4353,6 +4353,7 @@ void summary_delete(SummaryView *summaryview)
AlertValue aval;
MsgInfo *msginfo;
gboolean froze = FALSE;
+ gboolean show = FALSE;
if (!item) return;
@@ -4402,7 +4403,11 @@ void summary_delete(SummaryView *summaryview)
if (!node)
node = summary_find_prev_msg(summaryview, sel_last);
- summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
+ show = (prefs_common.always_show_msg == OPENMSG_ALWAYS) ||
+ ((prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
+ messageview_is_visible(summaryview->messageview)));
+
+ summary_select_node(summaryview, node, show, TRUE);
if (prefs_common.immediate_exec || folder_has_parent_of_type(item, F_TRASH)) {
summary_execute(summaryview);
