talons

commit 739c497b8ddb5cbc3ebae9109ba359a2576dbe1a
parent a0d8d01287ce90ca0652e8b321787389a57c240e
Author: Colin Leroy <colin@colino.net>
Date:   Sun,  2 Mar 2008 15:55:36 +0000

2008-03-02 [colin]	3.3.1cvs8

	* src/messageview.c
		MAEMO: Fix bug 1541, 'Deleting message from within
		read window displays next message then closes.'

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/messageview.c
 | 
2
+-

4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-02 [colin]	3.3.1cvs8
+
+	* src/messageview.c
+		MAEMO: Fix bug 1541, 'Deleting message from within 
+		read window displays next message then closes.'
+
 2008-03-02 [colin]	3.3.1cvs7
 
 	* src/main.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3242,3 +3242,4 @@
 ( cvs diff -u -r 1.382.2.438 -r 1.382.2.439 src/compose.c;  cvs diff -u -r 1.179.2.212 -r 1.179.2.213 src/imap.c;  cvs diff -u -r 1.94.2.171 -r 1.94.2.172 src/messageview.c;  cvs diff -u -r 1.1.4.97 -r 1.1.4.98 src/etpan/imap-thread.c;  ) > 3.3.1cvs5.patchset
 ( cvs diff -u -r 1.213.2.177 -r 1.213.2.178 src/folder.c;  cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/imap_gtk.c;  ) > 3.3.1cvs6.patchset
 ( cvs diff -u -r 1.115.2.190 -r 1.115.2.191 src/main.c;  ) > 3.3.1cvs7.patchset
+( cvs diff -u -r 1.94.2.172 -r 1.94.2.173 src/messageview.c;  ) > 3.3.1cvs8.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=8
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/messageview.c b/src/messageview.c
@@ -1288,7 +1288,7 @@ void messageview_delete(MessageView *msgview)
 		}
 	}
 #ifdef MAEMO
-	if (msgview->window) {
+	if (msgview->window && !prefs_common.always_show_msg) {
 		messageview_destroy(msgview);
 	}
 #endif