2012-11-18 [colin] 3.9.0cvs3-stable

	* src/summaryview.c
		Backport 3.9.0cvs6: Fix bug #2785, "Marking mails for
		deletion reopens internal message view"

diff --git a/ChangeLog b/ChangeLog
index a4d5dd2904ef3e0f78295d20ff6e78e123807452..b06036e52948bd6ec84bba475b8234cc7bf8d02b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-18 [colin]     3.9.0cvs3-stable
+
+       * src/summaryview.c
+               Backport 3.9.0cvs6: Fix bug #2785, "Marking mails for 
+               deletion reopens internal message view"
+

 2012-11-18 [colin]     3.9.0cvs2-stable
 
        * commitHelper
 2012-11-18 [colin]     3.9.0cvs2-stable
 
        * commitHelper

diff --git a/PATCHSETS b/PATCHSETS
index f651de5c879d5e3ad837b3859bb59ad04f10371b..33f255bfb96d94108ec70bd2dab199faa4df0a9a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4500,3 +4500,4 @@
 ( cvs diff -u -r 1.58.2.50 -r 1.58.2.51 po/de.po;  cvs diff -u -r 1.60.2.65 -r 1.60.2.66 po/es.po;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 po/fi.po;  cvs diff -u -r 1.42.2.58 -r 1.42.2.59 po/fr.po;  cvs diff -u -r 1.5.2.22 -r 1.5.2.23 po/hu.po;  cvs diff -u -r 1.50.2.44 -r 1.50.2.45 po/pt_BR.po;  cvs diff -u -r 1.4.2.12 -r 1.4.2.13 po/sv.po;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/uk.po;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/zh_TW.po;  ) > 3.8.1cvs123.patchset
 ( cvs diff -u -r 1.654.2.4577 -r 1.654.2.4578 configure.ac;  ) > 3.9.0cvs1.patchset
 ( cvs diff -u -r 1.1.2.40 -r 1.1.2.41 commitHelper;  cvs diff -u -r 1.9.2.25 -r 1.9.2.26 po/cs.po;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 po/fi.po;  cvs diff -u -r 1.2.2.36 -r 1.2.2.37 po/sk.po;  ) > 3.9.0cvs2-stable.patchset
 ( cvs diff -u -r 1.58.2.50 -r 1.58.2.51 po/de.po;  cvs diff -u -r 1.60.2.65 -r 1.60.2.66 po/es.po;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 po/fi.po;  cvs diff -u -r 1.42.2.58 -r 1.42.2.59 po/fr.po;  cvs diff -u -r 1.5.2.22 -r 1.5.2.23 po/hu.po;  cvs diff -u -r 1.50.2.44 -r 1.50.2.45 po/pt_BR.po;  cvs diff -u -r 1.4.2.12 -r 1.4.2.13 po/sv.po;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/uk.po;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/zh_TW.po;  ) > 3.8.1cvs123.patchset
 ( cvs diff -u -r 1.654.2.4577 -r 1.654.2.4578 configure.ac;  ) > 3.9.0cvs1.patchset
 ( cvs diff -u -r 1.1.2.40 -r 1.1.2.41 commitHelper;  cvs diff -u -r 1.9.2.25 -r 1.9.2.26 po/cs.po;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 po/fi.po;  cvs diff -u -r 1.2.2.36 -r 1.2.2.37 po/sk.po;  ) > 3.9.0cvs2-stable.patchset

+( cvs diff -u -r 1.395.2.456 -r 1.395.2.457 src/summaryview.c;  ) > 3.9.0cvs3-stable.patchset

diff --git a/configure.ac b/configure.ac
index 40097c7b8cec47a863849b2b5d65a6fb1f2492bb..0ba4010b7348d6c1e8b7a10341a4b2686d0b8cfe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=2
+EXTRA_VERSION=3

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=-stable
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=-stable
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 54410553a53a0c314331619d98985ffe8539c930..512fe37886ebe8a06782f17dfd40c01e6c174aa4 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4353,6 +4353,7 @@ void summary_delete(SummaryView *summaryview)
        AlertValue aval;
        MsgInfo *msginfo;
        gboolean froze = FALSE;
        AlertValue aval;
        MsgInfo *msginfo;
        gboolean froze = FALSE;

+       gboolean show = FALSE;

 
        if (!item) return;
 
 
        if (!item) return;
 


@@ -4402,7 +4403,11 @@ void summary_delete(SummaryView *summaryview)
        if (!node)
                node = summary_find_prev_msg(summaryview, sel_last);
 
        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);
        
        if (prefs_common.immediate_exec || folder_has_parent_of_type(item, F_TRASH)) {
                summary_execute(summaryview);