diff -p -up gimp-2.6.4/app/actions/image-commands.c.str-fmt gimp-2.6.4/app/actions/image-commands.c
--- gimp-2.6.4/app/actions/image-commands.c.str-fmt	2008-11-20 23:43:03.000000000 +0100
+++ gimp-2.6.4/app/actions/image-commands.c	2009-01-02 09:32:48.000000000 +0100
@@ -173,7 +173,7 @@ image_convert_cmd_callback (GtkAction *a
       if (! gimp_image_convert (image, value, 0, 0, FALSE, FALSE, 0, NULL,
                                 NULL, &error))
         {
-          gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+          gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, "%s",
                         error->message);
           g_clear_error (&error);
           return;
diff -p -up gimp-2.6.4/app/actions/layers-commands.c.str-fmt gimp-2.6.4/app/actions/layers-commands.c
--- gimp-2.6.4/app/actions/layers-commands.c.str-fmt	2008-11-20 23:43:04.000000000 +0100
+++ gimp-2.6.4/app/actions/layers-commands.c	2009-01-02 09:32:48.000000000 +0100
@@ -233,7 +233,7 @@ layers_new_cmd_callback (GtkAction *acti
 
       if (! floating_sel_to_layer (floating_sel, &error))
         {
-          gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+          gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, "%s",
                         error->message);
           g_clear_error (&error);
           return;
@@ -285,7 +285,7 @@ layers_new_last_vals_cmd_callback (GtkAc
 
       if (! floating_sel_to_layer (floating_sel, &error))
         {
-          gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+          gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, "%s",
                         error->message);
           g_clear_error (&error);
           return;
diff -p -up gimp-2.6.4/app/actions/select-commands.c.str-fmt gimp-2.6.4/app/actions/select-commands.c
--- gimp-2.6.4/app/actions/select-commands.c.str-fmt	2008-11-20 23:43:04.000000000 +0100
+++ gimp-2.6.4/app/actions/select-commands.c	2009-01-02 09:32:48.000000000 +0100
@@ -373,7 +373,7 @@ select_stroke_last_vals_cmd_callback (Gt
   if (! gimp_item_stroke (GIMP_ITEM (gimp_image_get_mask (image)),
                           drawable, context, desc, FALSE, NULL, &error))
     {
-      gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+      gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, "%s",
                     error->message);
       g_clear_error (&error);
     }
diff -p -up gimp-2.6.4/app/actions/vectors-commands.c.str-fmt gimp-2.6.4/app/actions/vectors-commands.c
--- gimp-2.6.4/app/actions/vectors-commands.c.str-fmt	2008-11-20 23:43:04.000000000 +0100
+++ gimp-2.6.4/app/actions/vectors-commands.c	2009-01-02 09:32:48.000000000 +0100
@@ -280,7 +280,7 @@ vectors_merge_visible_cmd_callback (GtkA
 
   if (! gimp_image_merge_visible_vectors (image, &error))
     {
-      gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+      gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, "%s",
                     error->message);
       g_clear_error (&error);
       return;
@@ -424,7 +424,7 @@ vectors_stroke_last_vals_cmd_callback (G
   if (! gimp_item_stroke (GIMP_ITEM (vectors), drawable, context, desc, FALSE,
                           NULL, &error))
     {
-      gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+      gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, "%s",
                     error->message);
       g_clear_error (&error);
     }
diff -p -up gimp-2.6.4/app/config/gimprc.c.str-fmt gimp-2.6.4/app/config/gimprc.c
--- gimp-2.6.4/app/config/gimprc.c.str-fmt	2008-11-20 23:43:04.000000000 +0100
+++ gimp-2.6.4/app/config/gimprc.c	2009-01-02 09:32:48.000000000 +0100
@@ -264,7 +264,7 @@ gimp_rc_load (GimpRc *rc)
                                       rc->system_gimprc, NULL, &error))
     {
       if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
-        g_message (error->message);
+        g_message ("%s", error->message);
 
       g_clear_error (&error);
     }
@@ -278,7 +278,7 @@ gimp_rc_load (GimpRc *rc)
     {
       if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
         {
-          g_message (error->message);
+          g_message ("%s", error->message);
 
           gimp_config_file_backup_on_error (rc->user_gimprc, "gimprc", NULL);
         }
@@ -524,7 +524,7 @@ gimp_rc_save (GimpRc *rc)
                                        header, footer, global,
                                        &error))
     {
-      g_message (error->message);
+      g_message ("%s", error->message);
       g_error_free (error);
     }
 
diff -p -up gimp-2.6.4/app/core/gimpcontainer-filter.c.str-fmt gimp-2.6.4/app/core/gimpcontainer-filter.c
--- gimp-2.6.4/app/core/gimpcontainer-filter.c.str-fmt	2008-11-20 23:42:58.000000000 +0100
+++ gimp-2.6.4/app/core/gimpcontainer-filter.c	2009-01-02 09:32:48.000000000 +0100
@@ -166,7 +166,7 @@ gimp_container_get_filtered_name_array (
     }
   else
     {
-      g_warning (error->message);
+      g_warning ("%s", error->message);
       g_error_free (error);
 
       *length = 0;
diff -p -up gimp-2.6.4/app/dialogs/convert-dialog.c.str-fmt gimp-2.6.4/app/dialogs/convert-dialog.c
--- gimp-2.6.4/app/dialogs/convert-dialog.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/dialogs/convert-dialog.c	2009-01-02 09:32:48.000000000 +0100
@@ -298,6 +298,7 @@ convert_dialog_response (GtkWidget     *
         {
           gimp_message (dialog->image->gimp, G_OBJECT (dialog->dialog),
                         GIMP_MESSAGE_WARNING,
+			"%s",
                         error->message);
           g_clear_error (&error);
 
diff -p -up gimp-2.6.4/app/dialogs/preferences-dialog.c.str-fmt gimp-2.6.4/app/dialogs/preferences-dialog.c
--- gimp-2.6.4/app/dialogs/preferences-dialog.c.str-fmt	2008-12-28 00:13:03.000000000 +0100
+++ gimp-2.6.4/app/dialogs/preferences-dialog.c	2009-01-02 09:32:48.000000000 +0100
@@ -1362,6 +1362,7 @@ prefs_message (GtkMessageType  type,
                                    destroy_with_parent ?
                                    GTK_DIALOG_DESTROY_WITH_PARENT : 0,
                                    type, GTK_BUTTONS_OK,
+				   "%s",
                                    message);
 
   g_signal_connect (dialog, "response",
diff -p -up gimp-2.6.4/app/dialogs/quit-dialog.c.str-fmt gimp-2.6.4/app/dialogs/quit-dialog.c
--- gimp-2.6.4/app/dialogs/quit-dialog.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/dialogs/quit-dialog.c	2009-01-02 09:32:48.000000000 +0100
@@ -216,7 +216,7 @@ quit_close_all_dialog_container_changed 
   text = g_strdup_printf (ngettext ("There is one image with unsaved changes:",
                                     "There are %d images with unsaved changes:",
                                     num_images), num_images);
-  gimp_message_box_set_primary_text (box, text);
+  gimp_message_box_set_primary_text (box, "%s", text);
   g_free (text);
 
   if (num_images == 0)
diff -p -up gimp-2.6.4/app/dialogs/stroke-dialog.c.str-fmt gimp-2.6.4/app/dialogs/stroke-dialog.c
--- gimp-2.6.4/app/dialogs/stroke-dialog.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/dialogs/stroke-dialog.c	2009-01-02 09:32:48.000000000 +0100
@@ -321,6 +321,7 @@ stroke_dialog_response (GtkWidget  *widg
             gimp_message (context->gimp,
                           G_OBJECT (widget),
                           GIMP_MESSAGE_WARNING,
+			  "%s",
                           error ? error->message : "NULL");
             g_clear_error (&error);
             return;
diff -p -up gimp-2.6.4/app/errors.c.str-fmt gimp-2.6.4/app/errors.c
--- gimp-2.6.4/app/errors.c.str-fmt	2008-11-20 23:43:08.000000000 +0100
+++ gimp-2.6.4/app/errors.c	2009-01-02 09:32:48.000000000 +0100
@@ -185,7 +185,7 @@ gimp_error_log_func (const gchar    *dom
                      const gchar    *message,
                      gpointer        data)
 {
-  gimp_fatal_error (message);
+  gimp_fatal_error ("%s", message);
 }
 
 static void
diff -p -up gimp-2.6.4/app/file/file-open.c.str-fmt gimp-2.6.4/app/file/file-open.c
--- gimp-2.6.4/app/file/file-open.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/file/file-open.c	2009-01-02 09:32:48.000000000 +0100
@@ -135,7 +135,7 @@ file_open_image (Gimp                *gi
           if (g_access (filename, R_OK) != 0)
             {
               g_free (filename);
-              g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_ACCES,
+              g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_ACCES, "%s",
                            g_strerror (errno));
               return NULL;
             }
@@ -617,13 +617,13 @@ file_open_profile_apply_rgb (GimpImage  
           g_object_set (config, "mode", GIMP_COLOR_MANAGEMENT_OFF, NULL);
 
           gimp_message (image->gimp, G_OBJECT (progress),
-                        GIMP_MESSAGE_WARNING, msg);
+                        GIMP_MESSAGE_WARNING, "%s", msg);
           g_free (msg);
         }
       else
         {
           gimp_message (image->gimp, G_OBJECT (progress),
-                        GIMP_MESSAGE_ERROR, error->message);
+                        GIMP_MESSAGE_ERROR, "%s", error->message);
         }
 
       g_error_free (error);
diff -p -up gimp-2.6.4/app/gui/gui.c.str-fmt gimp-2.6.4/app/gui/gui.c
--- gimp-2.6.4/app/gui/gui.c.str-fmt	2008-11-20 23:43:00.000000000 +0100
+++ gimp-2.6.4/app/gui/gui.c	2009-01-02 09:32:48.000000000 +0100
@@ -167,7 +167,7 @@ gui_abort (const gchar *abort_message)
                       "border-width", 12,
                       NULL);
 
-  gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), abort_message);
+  gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), "%s", abort_message);
 
   gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), box);
   gtk_widget_show (box);
diff -p -up gimp-2.6.4/app/gui/gui-message.c.str-fmt gimp-2.6.4/app/gui/gui-message.c
--- gimp-2.6.4/app/gui/gui-message.c.str-fmt	2008-11-20 23:43:00.000000000 +0100
+++ gimp-2.6.4/app/gui/gui-message.c	2009-01-02 09:32:48.000000000 +0100
@@ -218,7 +218,7 @@ gui_message_error_dialog (Gimp          
       dialog =
         gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (parent)),
                                 GTK_DIALOG_DESTROY_WITH_PARENT,
-                                type, GTK_BUTTONS_OK,
+                                type, GTK_BUTTONS_OK, "%s",
                                 message);
 
       g_signal_connect (dialog, "response",
diff -p -up gimp-2.6.4/app/main.c.str-fmt gimp-2.6.4/app/main.c
--- gimp-2.6.4/app/main.c.str-fmt	2008-11-20 23:43:08.000000000 +0100
+++ gimp-2.6.4/app/main.c	2009-01-02 09:32:48.000000000 +0100
@@ -691,14 +691,14 @@ gimp_sigfatal_handler (gint sig_num)
     case SIGQUIT:
     case SIGABRT:
     case SIGTERM:
-      gimp_terminate (g_strsignal (sig_num));
+      gimp_terminate ("%s", g_strsignal (sig_num));
       break;
 
     case SIGBUS:
     case SIGSEGV:
     case SIGFPE:
     default:
-      gimp_fatal_error (g_strsignal (sig_num));
+      gimp_fatal_error ("%s", g_strsignal (sig_num));
       break;
     }
 }
diff -p -up gimp-2.6.4/app/plug-in/gimppluginprocedure.c.str-fmt gimp-2.6.4/app/plug-in/gimppluginprocedure.c
--- gimp-2.6.4/app/plug-in/gimppluginprocedure.c.str-fmt	2008-11-20 23:43:08.000000000 +0100
+++ gimp-2.6.4/app/plug-in/gimppluginprocedure.c	2009-01-02 09:32:48.000000000 +0100
@@ -658,7 +658,7 @@ gimp_plug_in_procedure_get_pixbuf (const
 
   if (! pixbuf && error)
     {
-      g_printerr (error->message);
+      g_printerr ("%s", error->message);
       g_clear_error (&error);
     }
 
diff -p -up gimp-2.6.4/app/tools/gimpaligntool.c.str-fmt gimp-2.6.4/app/tools/gimpaligntool.c
--- gimp-2.6.4/app/tools/gimpaligntool.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimpaligntool.c	2009-01-02 09:32:48.000000000 +0100
@@ -633,7 +633,7 @@ gimp_align_tool_status_update (GimpTool 
         }
 
       if (status)
-        gimp_tool_push_status (tool, display, status);
+        gimp_tool_push_status (tool, display, "%s", status);
 
       if (free_status)
         g_free ((gchar *) status);
diff -p -up gimp-2.6.4/app/tools/gimpbucketfilltool.c.str-fmt gimp-2.6.4/app/tools/gimpbucketfilltool.c
--- gimp-2.6.4/app/tools/gimpbucketfilltool.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimpbucketfilltool.c	2009-01-02 09:32:48.000000000 +0100
@@ -157,7 +157,7 @@ gimp_bucket_fill_tool_button_release (Gi
                                        x, y, &error))
         {
           gimp_message (display->image->gimp, G_OBJECT (display),
-                        GIMP_MESSAGE_WARNING,
+                        GIMP_MESSAGE_WARNING, "%s",
                         error->message);
           g_clear_error (&error);
         }
diff -p -up gimp-2.6.4/app/tools/gimpcolorpickertool.c.str-fmt gimp-2.6.4/app/tools/gimpcolorpickertool.c
--- gimp-2.6.4/app/tools/gimpcolorpickertool.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimpcolorpickertool.c	2009-01-02 09:32:48.000000000 +0100
@@ -270,7 +270,7 @@ gimp_color_picker_tool_oper_update (Gimp
         }
       if (status_help != NULL)
         {
-          gimp_tool_push_status (tool, display, status_help);
+          gimp_tool_push_status (tool, display, "%s", status_help);
           g_free (status_help);
         }
     }
diff -p -up gimp-2.6.4/app/tools/gimpcurvestool.c.str-fmt gimp-2.6.4/app/tools/gimpcurvestool.c
--- gimp-2.6.4/app/tools/gimpcurvestool.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimpcurvestool.c	2009-01-02 09:32:48.000000000 +0100
@@ -331,7 +331,7 @@ gimp_curves_tool_oper_update (GimpTool  
   GIMP_COLOR_TOOL (tool)->pick_mode = mode;
 
   if (status && proximity)
-    gimp_tool_push_status (tool, display, status);
+    gimp_tool_push_status (tool, display, "%s", status);
 }
 
 static void
diff -p -up gimp-2.6.4/app/tools/gimpforegroundselecttool.c.str-fmt gimp-2.6.4/app/tools/gimpforegroundselecttool.c
--- gimp-2.6.4/app/tools/gimpforegroundselecttool.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimpforegroundselecttool.c	2009-01-02 09:32:48.000000000 +0100
@@ -334,7 +334,7 @@ gimp_foreground_select_tool_oper_update 
   if (proximity)
     {
       if (status)
-        gimp_tool_replace_status (tool, display, status);
+        gimp_tool_replace_status (tool, display, "%s", status);
 
       gimp_draw_tool_start (draw_tool, display);
     }
diff -p -up gimp-2.6.4/app/tools/gimpfreeselecttool.c.str-fmt gimp-2.6.4/app/tools/gimpfreeselecttool.c
--- gimp-2.6.4/app/tools/gimpfreeselecttool.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimpfreeselecttool.c	2009-01-02 09:32:48.000000000 +0100
@@ -1131,7 +1131,7 @@ gimp_free_select_tool_status_update (Gim
 
       if (status_text)
         {
-          gimp_tool_push_status (tool, display, status_text);
+          gimp_tool_push_status (tool, display, "%s", status_text);
         }
     }
 }
diff -p -up gimp-2.6.4/app/tools/gimpimagemaptool-settings.c.str-fmt gimp-2.6.4/app/tools/gimpimagemaptool-settings.c
--- gimp-2.6.4/app/tools/gimpimagemaptool-settings.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimpimagemaptool-settings.c	2009-01-02 09:32:48.000000000 +0100
@@ -179,7 +179,7 @@ gimp_image_map_tool_settings_import (Gim
   if (! tool_class->settings_import (tool, filename, &error))
     {
       gimp_message (GIMP_TOOL (tool)->tool_info->gimp, G_OBJECT (tool->shell),
-                    GIMP_MESSAGE_ERROR, error->message);
+                    GIMP_MESSAGE_ERROR, "%s", error->message);
       g_clear_error (&error);
 
       return FALSE;
@@ -208,7 +208,7 @@ gimp_image_map_tool_settings_export (Gim
   if (! tool_class->settings_export (tool, filename, &error))
     {
       gimp_message (GIMP_TOOL (tool)->tool_info->gimp, G_OBJECT (tool->shell),
-                    GIMP_MESSAGE_ERROR, error->message);
+                    GIMP_MESSAGE_ERROR, "%s", error->message);
       g_clear_error (&error);
 
       return FALSE;
diff -p -up gimp-2.6.4/app/tools/gimpiscissorstool.c.str-fmt gimp-2.6.4/app/tools/gimpiscissorstool.c
--- gimp-2.6.4/app/tools/gimpiscissorstool.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimpiscissorstool.c	2009-01-02 09:32:48.000000000 +0100
@@ -940,7 +940,7 @@ gimp_iscissors_tool_oper_update (GimpToo
       status = gimp_suggest_modifiers (_("Click-Drag to move this point"),
                                        GDK_SHIFT_MASK & ~state,
                                        _("%s: disable auto-snap"), NULL, NULL);
-      gimp_tool_replace_status (tool, display, status);
+      gimp_tool_replace_status (tool, display, "%s", status);
       g_free (status);
       iscissors->op = ISCISSORS_OP_MOVE_POINT;
     }
@@ -1006,7 +1006,7 @@ gimp_iscissors_tool_oper_update (GimpToo
                                                GDK_SHIFT_MASK & ~state,
                                                _("%s: disable auto-snap"),
                                                NULL, NULL);
-              gimp_tool_replace_status (tool, display, status);
+              gimp_tool_replace_status (tool, display, "%s", status);
               g_free (status);
             }
           iscissors->op = ISCISSORS_OP_ADD_POINT;
diff -p -up gimp-2.6.4/app/tools/gimpmeasuretool.c.str-fmt gimp-2.6.4/app/tools/gimpmeasuretool.c
--- gimp-2.6.4/app/tools/gimpmeasuretool.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimpmeasuretool.c	2009-01-02 09:32:48.000000000 +0100
@@ -569,7 +569,7 @@ gimp_measure_tool_cursor_update (GimpToo
                                                        GDK_MOD1_MASK & ~state,
                                                        NULL, NULL, NULL);
                     }
-                  gimp_tool_replace_status (tool, display, status);
+                  gimp_tool_replace_status (tool, display, "%s", status);
                   g_free (status);
                   measure->status_help = TRUE;
                   break;
@@ -582,7 +582,7 @@ gimp_measure_tool_cursor_update (GimpToo
                                                      "vertical guide"),
                                                    GDK_CONTROL_MASK & ~state,
                                                    NULL, NULL, NULL);
-                  gimp_tool_replace_status (tool, display, status);
+                  gimp_tool_replace_status (tool, display, "%s", status);
                   g_free (status);
                   measure->status_help = TRUE;
                   break;
@@ -610,7 +610,7 @@ gimp_measure_tool_cursor_update (GimpToo
                                                     | GDK_MOD1_MASK) & ~state,
                                                    NULL, NULL, NULL);
                 }
-              gimp_tool_replace_status (tool, display, status);
+              gimp_tool_replace_status (tool, display, "%s", status);
               g_free (status);
               measure->status_help = TRUE;
               break;
diff -p -up gimp-2.6.4/app/tools/gimppainttool.c.str-fmt gimp-2.6.4/app/tools/gimppainttool.c
--- gimp-2.6.4/app/tools/gimppainttool.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimppainttool.c	2009-01-02 09:32:48.000000000 +0100
@@ -325,7 +325,7 @@ gimp_paint_tool_button_press (GimpTool  
   if (! gimp_paint_core_start (core, drawable, paint_options, &curr_coords,
                                &error))
     {
-      gimp_tool_message (tool, display, error->message);
+      gimp_tool_message (tool, display, "%s", error->message);
       g_clear_error (&error);
       return;
     }
@@ -662,7 +662,7 @@ gimp_paint_tool_oper_update (GimpTool   
                                            _("%s for a straight line"),
                                            paint_tool->status_ctrl,
                                            NULL);
-          gimp_tool_push_status (tool, display, status);
+          gimp_tool_push_status (tool, display, "%s", status);
           g_free (status);
 
           paint_tool->draw_line = FALSE;
diff -p -up gimp-2.6.4/app/tools/gimpselectiontool.c.str-fmt gimp-2.6.4/app/tools/gimpselectiontool.c
--- gimp-2.6.4/app/tools/gimpselectiontool.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimpselectiontool.c	2009-01-02 09:32:48.000000000 +0100
@@ -313,7 +313,7 @@ gimp_selection_tool_oper_update (GimpToo
         }
 
       if (status)
-        gimp_tool_push_status (tool, display, status);
+        gimp_tool_push_status (tool, display, "%s", status);
 
       if (free_status)
         g_free ((gchar *) status);
diff -p -up gimp-2.6.4/app/tools/gimpsourcetool.c.str-fmt gimp-2.6.4/app/tools/gimpsourcetool.c
--- gimp-2.6.4/app/tools/gimpsourcetool.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimpsourcetool.c	2009-01-02 09:32:48.000000000 +0100
@@ -312,7 +312,7 @@ gimp_source_tool_oper_update (GimpTool  
       if (source->src_drawable == NULL)
         {
           if (state & GDK_CONTROL_MASK)
-            gimp_tool_replace_status (tool, display,
+            gimp_tool_replace_status (tool, display, "%s",
                                       source_tool->status_set_source);
           else
             {
@@ -322,7 +322,7 @@ gimp_source_tool_oper_update (GimpTool  
                                     gimp_get_mod_separator (),
                                     source_tool->status_set_source,
                                     NULL);
-              gimp_tool_replace_status (tool, display, status);
+              gimp_tool_replace_status (tool, display, "%s", status);
               g_free (status);
             }
         }
diff -p -up gimp-2.6.4/app/tools/gimptool.c.str-fmt gimp-2.6.4/app/tools/gimptool.c
--- gimp-2.6.4/app/tools/gimptool.c.str-fmt	2008-12-28 00:13:03.000000000 +0100
+++ gimp-2.6.4/app/tools/gimptool.c	2009-01-02 09:33:12.000000000 +0100
@@ -429,7 +429,7 @@ gimp_tool_initialize (GimpTool    *tool,
     {
       if (error)
         {
-          gimp_tool_message (tool, display, error->message);
+          gimp_tool_message (tool, display, "%s", error->message);
           g_clear_error (&error);
         }
 
diff -p -up gimp-2.6.4/app/tools/gimptransformtool.c.str-fmt gimp-2.6.4/app/tools/gimptransformtool.c
--- gimp-2.6.4/app/tools/gimptransformtool.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimptransformtool.c	2009-01-02 09:32:48.000000000 +0100
@@ -1179,7 +1179,7 @@ gimp_transform_tool_doit (GimpTransformT
 
   if (! active_item)
     {
-      gimp_tool_message (tool, display, message);
+      gimp_tool_message (tool, display, "%s",  message);
       return;
     }
 
diff -p -up gimp-2.6.4/app/tools/gimpvectortool.c.str-fmt gimp-2.6.4/app/tools/gimpvectortool.c
--- gimp-2.6.4/app/tools/gimpvectortool.c.str-fmt	2008-11-20 23:42:59.000000000 +0100
+++ gimp-2.6.4/app/tools/gimpvectortool.c	2009-01-02 09:32:48.000000000 +0100
@@ -1265,7 +1265,7 @@ gimp_vector_tool_status_update (GimpTool
       }
 
       if (status)
-        gimp_tool_push_status (tool, display, status);
+        gimp_tool_push_status (tool, display, "%s", status);
 
       if (free_status)
         g_free ((gchar *) status);
diff -p -up gimp-2.6.4/app/widgets/gimpcontrollerlist.c.str-fmt gimp-2.6.4/app/widgets/gimpcontrollerlist.c
--- gimp-2.6.4/app/widgets/gimpcontrollerlist.c.str-fmt	2008-11-20 23:43:05.000000000 +0100
+++ gimp-2.6.4/app/widgets/gimpcontrollerlist.c	2009-01-02 09:32:48.000000000 +0100
@@ -576,9 +576,9 @@ gimp_controller_list_remove_clicked (Gtk
                        "Selecting \"Disable Controller\" will disable "
                        "the controller without removing it."));
 
-  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box, "%s",
                                      primary);
-  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box, "%s",
                              secondary);
 
   g_free (primary);
diff -p -up gimp-2.6.4/app/widgets/gimperrordialog.c.str-fmt gimp-2.6.4/app/widgets/gimperrordialog.c
--- gimp-2.6.4/app/widgets/gimperrordialog.c.str-fmt	2008-11-20 23:43:05.000000000 +0100
+++ gimp-2.6.4/app/widgets/gimperrordialog.c	2009-01-02 09:32:48.000000000 +0100
@@ -165,7 +165,7 @@ gimp_error_dialog_add (GimpErrorDialog *
   dialog->num_messages++;
 
   if (overflow)
-    gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box), domain);
+    gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box), "%s", domain);
   else
     gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box),
                                        _("%s Message"), domain);
diff -p -up gimp-2.6.4/app/widgets/gimphelp.c.str-fmt gimp-2.6.4/app/widgets/gimphelp.c
--- gimp-2.6.4/app/widgets/gimphelp.c.str-fmt	2008-11-20 23:43:05.000000000 +0100
+++ gimp-2.6.4/app/widgets/gimphelp.c	2009-01-02 09:32:48.000000000 +0100
@@ -361,9 +361,9 @@ gimp_help_browser_error (Gimp         *g
         gimp_window_set_transient_for (GTK_WINDOW (dialog), window);
     }
 
-  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box, "%s",
                                      primary);
-  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box, text);
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box, "%s", text);
 
   if (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK)
     {
diff -p -up gimp-2.6.4/app/widgets/gimpwidgets-utils.c.str-fmt gimp-2.6.4/app/widgets/gimpwidgets-utils.c
--- gimp-2.6.4/app/widgets/gimpwidgets-utils.c.str-fmt	2008-11-20 23:43:05.000000000 +0100
+++ gimp-2.6.4/app/widgets/gimpwidgets-utils.c	2009-01-02 09:32:48.000000000 +0100
@@ -849,7 +849,7 @@ gimp_text_buffer_load (GtkTextBuffer  *b
 
   if (! file)
     {
-      g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+      g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), "%s",
                    g_strerror (errno));
       return FALSE;
     }
@@ -906,7 +906,7 @@ gimp_text_buffer_save (GtkTextBuffer  *b
 
   if (fd == -1)
     {
-      g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+      g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), "%s",
                    g_strerror (errno));
       return FALSE;
     }
@@ -933,7 +933,7 @@ gimp_text_buffer_save (GtkTextBuffer  *b
             {
               g_free (text_contents);
               close (fd);
-              g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+              g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), "%s",
                            g_strerror (errno));
               return FALSE;
             }
diff -p -up gimp-2.6.4/libgimpconfig/gimpconfigwriter.c.str-fmt gimp-2.6.4/libgimpconfig/gimpconfigwriter.c
--- gimp-2.6.4/libgimpconfig/gimpconfigwriter.c.str-fmt	2008-11-20 23:43:52.000000000 +0100
+++ gimp-2.6.4/libgimpconfig/gimpconfigwriter.c	2009-01-02 09:32:48.000000000 +0100
@@ -567,7 +567,7 @@ gimp_config_writer_linefeed (GimpConfigW
   if (writer->buffer->len == 0 && !writer->comment)
     {
       if (write (writer->fd, "\n", 1) < 0)
-        g_set_error (&writer->error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_WRITE,
+        g_set_error (&writer->error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_WRITE, "%s",
                      g_strerror (errno));
     }
   else
diff -p -up gimp-2.6.4/libgimpthumb/gimpthumbnail.c.str-fmt gimp-2.6.4/libgimpthumb/gimpthumbnail.c
--- gimp-2.6.4/libgimpthumb/gimpthumbnail.c.str-fmt	2008-11-20 23:43:08.000000000 +0100
+++ gimp-2.6.4/libgimpthumb/gimpthumbnail.c	2009-01-02 09:32:48.000000000 +0100
@@ -830,7 +830,7 @@ gimp_thumbnail_save (GimpThumbnail  *thu
   if (thumbnail->image_mimetype)
     {
       keys[i]   = TAG_THUMB_MIMETYPE;
-      values[i] = g_strdup_printf (thumbnail->image_mimetype);
+      values[i] = g_strdup_printf ("%s", thumbnail->image_mimetype);
       i++;
     }
 
diff -p -up gimp-2.6.4/plug-ins/common/lcms.c.str-fmt gimp-2.6.4/plug-ins/common/lcms.c
--- gimp-2.6.4/plug-ins/common/lcms.c.str-fmt	2008-11-20 23:43:49.000000000 +0100
+++ gimp-2.6.4/plug-ins/common/lcms.c	2009-01-02 09:32:48.000000000 +0100
@@ -802,7 +802,7 @@ lcms_image_set_profile (gint32       ima
 
       if (! file)
         {
-          g_message (error->message);
+          g_message ("%s", error->message);
           g_error_free (error);
 
           return FALSE;
@@ -1107,7 +1107,7 @@ lcms_load_profile (const gchar *filename
 
   if (! file)
     {
-      g_message (error->message);
+      g_message ("%s", error->message);
       g_error_free (error);
 
       return NULL;
diff -p -up gimp-2.6.4/plug-ins/common/mail.c.str-fmt gimp-2.6.4/plug-ins/common/mail.c
--- gimp-2.6.4/plug-ins/common/mail.c.str-fmt	2008-11-20 23:43:49.000000000 +0100
+++ gimp-2.6.4/plug-ins/common/mail.c	2009-01-02 09:32:48.000000000 +0100
@@ -352,7 +352,7 @@ save_image (const gchar *filename,
 
   if (! to64 (tmpname, mailpipe, &error))
     {
-      g_message (error->message);
+      g_message ("%s", error->message);
       g_error_free (error);
       goto error;
     }
diff -p -up gimp-2.6.4/plug-ins/file-bmp/bmp-write.c.str-fmt gimp-2.6.4/plug-ins/file-bmp/bmp-write.c
--- gimp-2.6.4/plug-ins/file-bmp/bmp-write.c.str-fmt	2008-11-20 23:43:42.000000000 +0100
+++ gimp-2.6.4/plug-ins/file-bmp/bmp-write.c	2009-01-02 09:32:48.000000000 +0100
@@ -123,9 +123,10 @@ warning_dialog (const gchar *primary,
 
   dialog = gtk_message_dialog_new (NULL, 0,
                                    GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL,
+				   "%s",
                                    primary);
 
-  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s",
                                             secondary);
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
diff -p -up gimp-2.6.4/plug-ins/file-fits/fits.c.str-fmt gimp-2.6.4/plug-ins/file-fits/fits.c
--- gimp-2.6.4/plug-ins/file-fits/fits.c.str-fmt	2008-11-20 23:43:41.000000000 +0100
+++ gimp-2.6.4/plug-ins/file-fits/fits.c	2009-01-02 09:32:48.000000000 +0100
@@ -1065,5 +1065,5 @@ show_fits_errors (void)
 
   /* Write out error messages of FITS-Library */
   while ((msg = fits_get_error ()) != NULL)
-    g_message (msg);
+    g_message ("%s", msg);
 }
diff -p -up gimp-2.6.4/plug-ins/file-jpeg/jpeg.c.str-fmt gimp-2.6.4/plug-ins/file-jpeg/jpeg.c
--- gimp-2.6.4/plug-ins/file-jpeg/jpeg.c.str-fmt	2009-01-01 15:03:33.000000000 +0100
+++ gimp-2.6.4/plug-ins/file-jpeg/jpeg.c	2009-01-02 09:32:48.000000000 +0100
@@ -564,5 +564,5 @@ my_output_message (j_common_ptr cinfo)
   gchar  buffer[JMSG_LENGTH_MAX + 1];
 
   (*cinfo->err->format_message)(cinfo, buffer);
-  g_message (buffer);
+  g_message ("%s", buffer);
 }
diff -p -up gimp-2.6.4/plug-ins/file-uri/uri.c.str-fmt gimp-2.6.4/plug-ins/file-uri/uri.c
--- gimp-2.6.4/plug-ins/file-uri/uri.c.str-fmt	2008-11-20 23:43:49.000000000 +0100
+++ gimp-2.6.4/plug-ins/file-uri/uri.c	2009-01-02 09:32:48.000000000 +0100
@@ -102,7 +102,7 @@ query (void)
 
   if (! uri_backend_init (PLUG_IN_BINARY, FALSE, 0, &error))
     {
-      g_message (error->message);
+      g_message ("%s", error->message);
       g_clear_error (&error);
 
       return;
diff -p -up gimp-2.6.4/plug-ins/help/gimphelpdomain.c.str-fmt gimp-2.6.4/plug-ins/help/gimphelpdomain.c
--- gimp-2.6.4/plug-ins/help/gimphelpdomain.c.str-fmt	2008-11-20 23:43:49.000000000 +0100
+++ gimp-2.6.4/plug-ins/help/gimphelpdomain.c	2009-01-02 09:32:48.000000000 +0100
@@ -202,7 +202,7 @@ gimp_help_domain_map (GimpHelpDomain    
               break;
 
             default:
-              g_message (error->message);
+              g_message ("%s", error->message);
               break;
             }
 
diff -p -up gimp-2.6.4/plug-ins/ifs-compose/ifs-compose.c.str-fmt gimp-2.6.4/plug-ins/ifs-compose/ifs-compose.c
--- gimp-2.6.4/plug-ins/ifs-compose/ifs-compose.c.str-fmt	2008-11-20 23:43:42.000000000 +0100
+++ gimp-2.6.4/plug-ins/ifs-compose/ifs-compose.c	2009-01-02 09:32:48.000000000 +0100
@@ -2341,7 +2341,7 @@ ifscompose_message_dialog (GtkMessageTyp
 {
   GtkWidget *dialog;
 
-  dialog = gtk_message_dialog_new (parent, 0, type, GTK_BUTTONS_OK, message);
+  dialog = gtk_message_dialog_new (parent, 0, type, GTK_BUTTONS_OK, "%s", message);
 
   if (title)
     gtk_window_set_title (GTK_WINDOW (dialog), title);
diff -p -up gimp-2.6.4/plug-ins/print/print.c.str-fmt gimp-2.6.4/plug-ins/print/print.c
--- gimp-2.6.4/plug-ins/print/print.c.str-fmt	2008-11-20 23:43:49.000000000 +0100
+++ gimp-2.6.4/plug-ins/print/print.c	2009-01-02 09:32:48.000000000 +0100
@@ -347,7 +347,7 @@ print_show_error (const gchar *message)
                                    GTK_BUTTONS_OK,
                                    _("An error occurred while trying to print:"));
 
-  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s",
                                             message);
 
   gtk_dialog_run (GTK_DIALOG (dialog));
