2006-05-12 [paul] 2.2.0cvs6

	* src/summaryview.c
		always obey 'confirm before marking all
		mails read' option

diff --git a/ChangeLog b/ChangeLog
index 1b8bb2b3d1e0a68cc86b0d2b74852e3a86eef998..c8d12d7431b9baf72704740c005dd595441cac51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-12 [paul]      2.2.0cvs6
+
+       * src/summaryview.c
+               always obey 'confirm before marking all
+               mails read' option
+
 2006-05-12 [paul]      2.2.0cvs5
 
        * src/textview.c

diff --git a/PATCHSETS b/PATCHSETS
index 6d47fb8681ba902cb8978cf39249134c97af3fa5..a6e39c4dff9b291bfb8a8147d7fb8345b86145b5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1475,3 +1475,4 @@
 ( cvs diff -u -r 1.213.2.91 -r 1.213.2.92 src/folder.c;  cvs diff -u -r 1.274.2.108 -r 1.274.2.109 src/mainwindow.c;  cvs diff -u -r 1.39.2.16 -r 1.39.2.17 src/mainwindow.h;  cvs diff -u -r 1.94.2.82 -r 1.94.2.83 src/messageview.c;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/prefs_spelling.c;  cvs diff -u -r 1.47.2.28 -r 1.47.2.29 src/procheader.c;  cvs diff -u -r 1.150.2.61 -r 1.150.2.62 src/procmsg.c;  cvs diff -u -r 1.60.2.27 -r 1.60.2.28 src/procmsg.h;  cvs diff -u -r 1.395.2.194 -r 1.395.2.195 src/summaryview.c;  cvs diff -u -r 1.43.2.43 -r 1.43.2.44 src/toolbar.c;  cvs diff -u -r 1.19.2.10 -r 1.19.2.11 src/toolbar.h;  ) > 2.2.0cvs3.patchset
 ( cvs diff -u -r 1.382.2.269 -r 1.382.2.270 src/compose.c;  cvs diff -u -r 1.50.2.24 -r 1.50.2.25 src/compose.h;  cvs diff -u -r 1.115.2.83 -r 1.115.2.84 src/main.c;  cvs diff -u -r 1.79.2.24 -r 1.79.2.25 src/mh.c;  ) > 2.2.0cvs4.patchset
 ( cvs diff -u -r 1.96.2.112 -r 1.96.2.113 src/textview.c;  ) > 2.2.0cvs5.patchset
+( cvs diff -u -r 1.395.2.195 -r 1.395.2.196 src/summaryview.c;  ) > 2.2.0cvs6.patchset

diff --git a/configure.ac b/configure.ac
index 6b7ff545e91d8f261595e8c9c857a8436dc8221d..478db2ee11936e3db3dedde7112fcd7d6db8ef78 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 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
index 0981c48ce96b92f474f94ed06a0772b1de21dd44..816ef168402dce8d3c964e4c0bd0ef41f4b4f347 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3150,7 +3150,21 @@ void summary_mark_all_read(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCTreeNode *node;
+       AlertValue val;
 
+       if (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,
+                         TRUE, NULL, ALERT_QUESTION, G_ALERTALTERNATE);
+
+               if (val == G_ALERTDEFAULT ||
+                   val == (G_ALERTDEFAULT|G_ALERTDISABLE))
+                       return;
+               else if (val == (G_ALERTALTERNATE|G_ALERTDISABLE))
+                       prefs_common.ask_mark_all_read = FALSE;
+       }
+       
        START_LONG_OPERATION(summaryview);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;