balsa r8008 - in trunk: . libbalsa src

[PeterB svn gnome org]

Author: PeterB
Date: Sat Nov 22 19:03:06 2008
New Revision: 8008
URL: http://svn.gnome.org/viewvc/balsa?rev=8008&view=rev

Log:
use only static format strings

Modified:
   trunk/ChangeLog
   trunk/libbalsa/libbalsa-vfs.c
   trunk/libbalsa/send.c
   trunk/src/ab-main.c
   trunk/src/sendmsg-window.c
   trunk/src/store-address.c

Modified: trunk/libbalsa/libbalsa-vfs.c
==============================================================================
--- trunk/libbalsa/libbalsa-vfs.c	(original)
+++ trunk/libbalsa/libbalsa-vfs.c	Sat Nov 22 19:03:06 2008
@@ -563,7 +563,7 @@
         result = gnome_vfs_open_uri(&handle, priv->gvfs_uri, openmode);
     if (result != GNOME_VFS_OK) {
         g_set_error(err, LIBBALSA_ERROR_QUARK, result,
-                    gnome_vfs_result_to_string(result));
+                    "%s", gnome_vfs_result_to_string(result));
         return NULL;
     }
 
@@ -711,7 +711,7 @@
 
     if ((vfs_res = gnome_vfs_unlink_from_uri(priv->gvfs_uri)) != GNOME_VFS_OK)
         g_set_error(err, LIBBALSA_VFS_ERROR_QUARK, vfs_res,
-                    gnome_vfs_result_to_string(vfs_res));
+                    "%s", gnome_vfs_result_to_string(vfs_res));
     else
         result = 0;
 #else

Modified: trunk/libbalsa/send.c
==============================================================================
--- trunk/libbalsa/send.c	(original)
+++ trunk/libbalsa/send.c	Sat Nov 22 19:03:06 2008
@@ -1738,7 +1738,7 @@
 					      err->message)
 			    : g_strdup_printf(_("Cannot read %s"),
 					      libbalsa_vfs_get_uri_utf8(body->file_uri));
-			g_set_error(error, err->domain, err->code, msg);
+			g_set_error(error, err->domain, err->code, "%s", msg);
 			g_clear_error(&err);
 			g_free(msg);
 		    }
@@ -1807,7 +1807,7 @@
 					      err->message)
 			    : g_strdup_printf(_("Cannot read %s"),
 					      libbalsa_vfs_get_uri_utf8(body->file_uri));
-			g_set_error(error, err->domain, err->code, msg);
+			g_set_error(error, err->domain, err->code, "%s", msg);
 			g_clear_error(&err);
 			g_free(msg);
 		    }

Modified: trunk/src/ab-main.c
==============================================================================
--- trunk/src/ab-main.c	(original)
+++ trunk/src/ab-main.c	Sat Nov 22 19:03:06 2008
@@ -1053,7 +1053,8 @@
     va_end(va_args);
     d = gtk_message_dialog_new(GTK_WINDOW(ab_window),
                                GTK_DIALOG_DESTROY_WITH_PARENT,
-                               GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, msg);
+                               GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+                               "%s", msg);
     gtk_dialog_run(GTK_DIALOG(d));
     gtk_widget_destroy(d);
 }

Modified: trunk/src/sendmsg-window.c
==============================================================================
--- trunk/src/sendmsg-window.c	(original)
+++ trunk/src/sendmsg-window.c	Sat Nov 22 19:03:06 2008
@@ -5748,7 +5748,6 @@
     if (can_encrypt) {
 	GtkWidget *dialog;
 	gint choice;
-	gchar * message;
 	GtkWidget *dialog_action_area;
 	GtkWidget *button;
 	GtkWidget *alignment;
@@ -5756,18 +5755,16 @@
 	GtkWidget *image;
 	GtkWidget *label;
 
-	message =
-	    g_strdup_printf(_("You did not select encryption for this message, although "
-			      "%s public keys are available for all recipients. In order "
-			      "to protect your privacy, the message could be %s encrypted."),
-			    gpgme_get_protocol_name(protocol),
-			    gpgme_get_protocol_name(protocol));
 	dialog = gtk_message_dialog_new
 	    (GTK_WINDOW(bsmsg->window),
 	     GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
 	     GTK_MESSAGE_QUESTION,
 	     GTK_BUTTONS_NONE,
-	     message);
+	     _("You did not select encryption for this message, although "
+               "%s public keys are available for all recipients. In order "
+               "to protect your privacy, the message could be %s encrypted."),
+             gpgme_get_protocol_name(protocol),
+             gpgme_get_protocol_name(protocol));
 
 	dialog_action_area = GTK_DIALOG(dialog)->action_area;
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog_action_area), GTK_BUTTONBOX_END);
@@ -5876,7 +5873,7 @@
                 (GTK_WINDOW(bsmsg->window),
                  GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
                  GTK_MESSAGE_QUESTION,
-                 GTK_BUTTONS_OK_CANCEL, message->str);
+                 GTK_BUTTONS_OK_CANCEL, "%s", message->str);
             g_string_free(message, TRUE);
             choice = gtk_dialog_run(GTK_DIALOG(dialog));
             gtk_widget_destroy(dialog);

Modified: trunk/src/store-address.c
==============================================================================
--- trunk/src/store-address.c	(original)
+++ trunk/src/store-address.c	Sat Nov 22 19:03:06 2008
@@ -258,7 +258,7 @@
                 msg = _("Unexpected address book error. Report it."); break;
             }
         }
-        balsa_information_parented(window, LIBBALSA_INFORMATION_ERROR, msg);
+        balsa_information_parented(window, LIBBALSA_INFORMATION_ERROR, "%s", msg);
     }
     
     g_object_unref(address);