From: wwp <wwp@free.fr>
Date: Fri, 9 Feb 2018 21:36:41 +0000 (+0100)
Subject: Update few occurrences to the new alertpanel() API (and by the way,
X-Git-Tag: 3.17.0~209
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=a99a6bc52c2006c6910e2fb472c3cac2e714586b

Update few occurrences to the new alertpanel() API (and by the way,
solve a leaking button_label strinc allocation).
---

diff --git a/src/compose.c b/src/compose.c
index 0c967392c..6508ebfff 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5136,22 +5136,16 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_everythin
 		if (*str == '\0' && check_everything == TRUE &&
 		    compose->mode != COMPOSE_REDIRECT) {
 			AlertValue aval;
-			gchar *button_label;
 			gchar *message;
 
-			if (compose->sending)
-				button_label = g_strconcat("+", _("_Send"), NULL);
-			else
-				button_label = g_strconcat("+", _("_Queue"), NULL);
 			message = g_strdup_printf(_("Subject is empty. %s"),
 					compose->sending?_("Send it anyway?"):
 					_("Queue it anyway?"));
 
 			aval = alertpanel_full(compose->sending?_("Send"):_("Send later"), message,
-					       GTK_STOCK_CANCEL, button_label, NULL, ALERTFOCUS_FIRST,
-								 TRUE, NULL, ALERT_QUESTION);
+					       GTK_STOCK_CANCEL, compose->sending?_("_Send"):_("_Queue"), NULL,
+					       ALERTFOCUS_FIRST, TRUE, NULL, ALERT_QUESTION);
 			g_free(message);
-			g_free(button_label);
 			if (aval & G_ALERTDISABLE) {
 				aval &= ~G_ALERTDISABLE;
 				prefs_common.warn_empty_subj = FALSE;
@@ -5185,20 +5179,15 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_everythin
 		}
 		if (cnt > prefs_common.warn_sending_many_recipients_num) {
 			AlertValue aval;
-			gchar *button_label;
 			gchar *message;
 
-			if (compose->sending)
-				button_label = g_strconcat("+", _("_Send"), NULL);
-			else
-				button_label = g_strconcat("+", _("_Queue"), NULL);
 			message = g_strdup_printf(_("Sending to %d recipients. %s"), cnt,
 					compose->sending?_("Send it anyway?"):
 					_("Queue it anyway?"));
 
 			aval = alertpanel_full(compose->sending?_("Send"):_("Send later"), message,
-					       GTK_STOCK_CANCEL, button_label, NULL, ALERTFOCUS_FIRST,
-								 TRUE, NULL, ALERT_QUESTION);
+					       GTK_STOCK_CANCEL, compose->sending?_("_Send"):_("_Queue"), NULL,
+					       ALERTFOCUS_FIRST, TRUE, NULL, ALERT_QUESTION);
 			g_free(message);
 			if (aval & G_ALERTDISABLE) {
 				aval &= ~G_ALERTDISABLE;
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index b4e4198ce..61b81514f 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -1293,7 +1293,7 @@ static void prefs_action_filterbtn_cb(GtkWidget *widget, gpointer data)
 	if(modified && alertpanel(_("Entry was modified"),
 			_("Opening the filter action dialog will clear current modifications "
 			"of the command line."),
-			GTK_STOCK_CANCEL, _("+_Continue editing"), NULL) != G_ALERTDEFAULT)
+			GTK_STOCK_CANCEL, _("_Continue editing"), NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT)
 		return;
 */
 	action_str = gtk_editable_get_chars(GTK_EDITABLE(actions.cmd_entry), 0, -1);