2006-06-12 [colin] 2.3.0cvs6

	* src/folderview.c
		Fix double-ask of "Do you want to mark all
		as read"

diff --git a/ChangeLog b/ChangeLog
index 025a4d23e3b60c2fe9f42f3b2fb41fb50dfda58a..f470a2809e45a642ab5b215c2c13ed7091b42c30 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-12 [colin]     2.3.0cvs6
+
+       * src/folderview.c
+               Fix double-ask of "Do you want to mark all
+               as read"
+
 2006-06-12 [colin]     2.3.0cvs5
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index a8f7f57bd6eb346355ba2bb868116a3efe92514d..88d26c5376cdfbc5c9c3d8abd32ba6129e4f43f1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1580,3 +1580,4 @@
 ( cvs diff -u -r 1.8.2.3 -r 1.8.2.4 .cvsignore;  ) > 2.3.0cvs3.patchset
 ( cvs diff -u -r 1.395.2.218 -r 1.395.2.219 src/summaryview.c;  cvs diff -u -r 1.204.2.87 -r 1.204.2.88 src/prefs_common.c;  cvs diff -u -r 1.103.2.50 -r 1.103.2.51 src/prefs_common.h;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gedit-print.c;  cvs diff -u -r 1.4.2.15 -r 1.4.2.16 src/prefs_fonts.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 manual/advanced.xml;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 manual/fr/advanced.xml;  ) > 2.3.0cvs4.patchset
 ( cvs diff -u -r 1.382.2.276 -r 1.382.2.277 src/compose.c;  cvs diff -u -r 1.50.2.25 -r 1.50.2.26 src/compose.h;  cvs diff -u -r 1.213.2.97 -r 1.213.2.98 src/folder.c;  cvs diff -u -r 1.87.2.28 -r 1.87.2.29 src/folder.h;  cvs diff -u -r 1.179.2.119 -r 1.179.2.120 src/imap.c;  cvs diff -u -r 1.149.2.51 -r 1.149.2.52 src/inc.c;  cvs diff -u -r 1.115.2.89 -r 1.115.2.90 src/main.c;  cvs diff -u -r 1.94.2.85 -r 1.94.2.86 src/messageview.c;  cvs diff -u -r 1.79.2.34 -r 1.79.2.35 src/mh.c;  cvs diff -u -r 1.52.2.20 -r 1.52.2.21 src/prefs_folder_item.c;  cvs diff -u -r 1.47.2.30 -r 1.47.2.31 src/procheader.c;  cvs diff -u -r 1.49.2.76 -r 1.49.2.77 src/procmime.c;  cvs diff -u -r 1.150.2.67 -r 1.150.2.68 src/procmsg.c;  cvs diff -u -r 1.60.2.28 -r 1.60.2.29 src/procmsg.h;  cvs diff -u -r 1.17.2.30 -r 1.17.2.31 src/send_message.c;  cvs diff -u -r 1.395.2.219 -r 1.395.2.220 src/summaryview.c;  cvs diff -u -r 1.43.2.46 -r 1.43.2.47 src/toolbar.c;  ) > 2.3.0cvs5.patchset
+( cvs diff -u -r 1.207.2.102 -r 1.207.2.103 src/folderview.c;  ) > 2.3.0cvs6.patchset

diff --git a/configure.ac b/configure.ac
index 948cfbf0e6a47eb1b85f4d74eec6218a04cd98e8..6e34bfe7f5622906085926226df57faea093f5ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 18c6035c0f693a959a3ebe666294589519aa4f47..06f1e8c5cebf8da48c74349e36f26690a4cf29d1 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -717,7 +717,8 @@ static void mark_all_read_cb(FolderView *folderview, guint action,
        if (item == NULL)
                return;
 
-       if (prefs_common.ask_mark_all_read) {
+       if (folderview->summaryview->folder_item != item
+       &&  prefs_common.ask_mark_all_read) {
                val = alertpanel_full(_("Mark all as read"),
                        _("Do you really want to mark all mails in this "
                          "folder as read ?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,