[Commits] [SCM] claws branch, master, updated. 3.11.1-195-gd094dae

[claws at claws-mail.org]

The branch, master has been updated
       via  d094dae1240af8aac8266abbbc597f790142cd1f (commit)
       via  ba83c690aa9f3341634234a45c922cab888f4867 (commit)
      from  ffd36983385969ebd6d6f2ee0ac5a272d7523a7b (commit)

Summary of changes:
 src/folderview.c  |   14 +++++++++-----
 src/summaryview.c |    2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit d094dae1240af8aac8266abbbc597f790142cd1f
Author: Paul <paul at claws-mail.org>
Date:   Wed Jul 8 05:12:55 2015 +0100

    make 'mark all as read' dialogue button style match that in folderview

diff --git a/src/summaryview.c b/src/summaryview.c
index 01d284a..1f6308c 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4126,7 +4126,7 @@ void summary_mark_all_read(SummaryView *summaryview)
 	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, _("Mark all as read"), NULL,
+			  "folder as read?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
 			  TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
 		if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)

commit ba83c690aa9f3341634234a45c922cab888f4867
Author: Paul <paul at claws-mail.org>
Date:   Wed Jul 8 05:11:43 2015 +0100

    fix dialogue question when recursively marking all as read

diff --git a/src/folderview.c b/src/folderview.c
index 45e6537..c7dcd80 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -830,16 +830,20 @@ static void mark_all_read_handler(GtkAction *action, gpointer data, gboolean rec
 	FolderView *folderview = (FolderView *)data;
 	FolderItem *item;
 	AlertValue val;
+	gchar *message;
 	
 	item = folderview_get_selected_item(folderview);
 	if (item == NULL)
 		return;
 
-	if (folderview->summaryview->folder_item != item
-	&&  prefs_common.ask_mark_all_read) {
+	message = recursive? _("Do you really want to mark all mails in this "
+			       "folder and its sub-folders as read?") :
+			     _("Do you really want to mark all mails in this "
+			       "folder as 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,
+			  message, GTK_STOCK_NO, GTK_STOCK_YES, NULL,
 			  TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
 		if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -847,7 +851,7 @@ static void mark_all_read_handler(GtkAction *action, gpointer data, gboolean rec
 		else if (val & G_ALERTDISABLE)
 			prefs_common.ask_mark_all_read = FALSE;
 	}
-
+	g_free(message);
 	
 	folder_item_update_freeze();
 	if (folderview->summaryview->folder_item != item && !recursive)

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail