[Commits] [SCM] claws branch, master, updated. 3.14.1-64-g4a92e36

[wwp at claws-mail.org]

The branch, master has been updated
       via  4a92e36b32bf29d913acf1fed9d81261aa7b4063 (commit)
      from  a38971609f56d457f68591d7384490aec06b5638 (commit)

Summary of changes:
 src/compose.c           |    4 ++--
 src/prefs_folder_item.c |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 4a92e36b32bf29d913acf1fed9d81261aa7b4063
Author: wwp <wwp at free.fr>
Date:   Tue Dec 20 23:01:29 2016 +0100

    Fix extra arguments to g_strdup_printf (thanks to coverity scan),
    add quotes around header names in few dialogs.

diff --git a/src/compose.c b/src/compose.c
index fc02ba7..0147385 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5036,7 +5036,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
 				gtk_widget_show_all(compose->window);
 			}
 			aval = alertpanel(_("Send"),
-					  _("The only recipient is the default Cc address. Send anyway?"),
+					  _("The only recipient is the default 'Cc' address. Send anyway?"),
 					  GTK_STOCK_CANCEL, g_strconcat("+", _("_Send"), NULL), NULL);
 			if (aval != G_ALERTALTERNATE)
 				return FALSE;
@@ -5068,7 +5068,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
 				gtk_widget_show_all(compose->window);
 			}
 			aval = alertpanel(_("Send"),
-					  _("The only recipient is the default BCC address. Send anyway?"),
+					  _("The only recipient is the default 'Bcc' address. Send anyway?"),
 					  GTK_STOCK_CANCEL, g_strconcat("+", _("_Send"), NULL), NULL);
 			if (aval != G_ALERTALTERNATE)
 				return FALSE;
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index b52187b..f407efb 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -919,7 +919,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default To */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"), NULL);
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"));
 		checkbtn_default_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -943,7 +943,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 
 		/* Default address to reply to */
 		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"),
-				 _(" for replies"), NULL);
+				 _(" for replies"));
 		checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -966,7 +966,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Cc */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Cc:"), NULL);
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Cc:"));
 		checkbtn_default_cc = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_cc, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -1012,7 +1012,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Reply-to */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Reply-To:"), NULL);
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Reply-To:"));
 		checkbtn_default_replyto = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_replyto, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);

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


hooks/post-receive
-- 
Claws Mail