1 |
diff -p -up gimp-2.6.4/app/actions/image-commands.c.str-fmt gimp-2.6.4/app/actions/image-commands.c |
2 |
--- gimp-2.6.4/app/actions/image-commands.c.str-fmt 2008-11-20 23:43:03.000000000 +0100 |
3 |
+++ gimp-2.6.4/app/actions/image-commands.c 2009-01-02 09:32:48.000000000 +0100 |
4 |
@@ -173,7 +173,7 @@ image_convert_cmd_callback (GtkAction *a |
5 |
if (! gimp_image_convert (image, value, 0, 0, FALSE, FALSE, 0, NULL, |
6 |
NULL, &error)) |
7 |
{ |
8 |
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, |
9 |
+ gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, "%s", |
10 |
error->message); |
11 |
g_clear_error (&error); |
12 |
return; |
13 |
diff -p -up gimp-2.6.4/app/actions/layers-commands.c.str-fmt gimp-2.6.4/app/actions/layers-commands.c |
14 |
--- gimp-2.6.4/app/actions/layers-commands.c.str-fmt 2008-11-20 23:43:04.000000000 +0100 |
15 |
+++ gimp-2.6.4/app/actions/layers-commands.c 2009-01-02 09:32:48.000000000 +0100 |
16 |
@@ -233,7 +233,7 @@ layers_new_cmd_callback (GtkAction *acti |
17 |
|
18 |
if (! floating_sel_to_layer (floating_sel, &error)) |
19 |
{ |
20 |
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, |
21 |
+ gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, "%s", |
22 |
error->message); |
23 |
g_clear_error (&error); |
24 |
return; |
25 |
@@ -285,7 +285,7 @@ layers_new_last_vals_cmd_callback (GtkAc |
26 |
|
27 |
if (! floating_sel_to_layer (floating_sel, &error)) |
28 |
{ |
29 |
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, |
30 |
+ gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, "%s", |
31 |
error->message); |
32 |
g_clear_error (&error); |
33 |
return; |
34 |
diff -p -up gimp-2.6.4/app/actions/select-commands.c.str-fmt gimp-2.6.4/app/actions/select-commands.c |
35 |
--- gimp-2.6.4/app/actions/select-commands.c.str-fmt 2008-11-20 23:43:04.000000000 +0100 |
36 |
+++ gimp-2.6.4/app/actions/select-commands.c 2009-01-02 09:32:48.000000000 +0100 |
37 |
@@ -373,7 +373,7 @@ select_stroke_last_vals_cmd_callback (Gt |
38 |
if (! gimp_item_stroke (GIMP_ITEM (gimp_image_get_mask (image)), |
39 |
drawable, context, desc, FALSE, NULL, &error)) |
40 |
{ |
41 |
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, |
42 |
+ gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, "%s", |
43 |
error->message); |
44 |
g_clear_error (&error); |
45 |
} |
46 |
diff -p -up gimp-2.6.4/app/actions/vectors-commands.c.str-fmt gimp-2.6.4/app/actions/vectors-commands.c |
47 |
--- gimp-2.6.4/app/actions/vectors-commands.c.str-fmt 2008-11-20 23:43:04.000000000 +0100 |
48 |
+++ gimp-2.6.4/app/actions/vectors-commands.c 2009-01-02 09:32:48.000000000 +0100 |
49 |
@@ -280,7 +280,7 @@ vectors_merge_visible_cmd_callback (GtkA |
50 |
|
51 |
if (! gimp_image_merge_visible_vectors (image, &error)) |
52 |
{ |
53 |
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, |
54 |
+ gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, "%s", |
55 |
error->message); |
56 |
g_clear_error (&error); |
57 |
return; |
58 |
@@ -424,7 +424,7 @@ vectors_stroke_last_vals_cmd_callback (G |
59 |
if (! gimp_item_stroke (GIMP_ITEM (vectors), drawable, context, desc, FALSE, |
60 |
NULL, &error)) |
61 |
{ |
62 |
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, |
63 |
+ gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING, "%s", |
64 |
error->message); |
65 |
g_clear_error (&error); |
66 |
} |
67 |
diff -p -up gimp-2.6.4/app/config/gimprc.c.str-fmt gimp-2.6.4/app/config/gimprc.c |
68 |
--- gimp-2.6.4/app/config/gimprc.c.str-fmt 2008-11-20 23:43:04.000000000 +0100 |
69 |
+++ gimp-2.6.4/app/config/gimprc.c 2009-01-02 09:32:48.000000000 +0100 |
70 |
@@ -264,7 +264,7 @@ gimp_rc_load (GimpRc *rc) |
71 |
rc->system_gimprc, NULL, &error)) |
72 |
{ |
73 |
if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT) |
74 |
- g_message (error->message); |
75 |
+ g_message ("%s", error->message); |
76 |
|
77 |
g_clear_error (&error); |
78 |
} |
79 |
@@ -278,7 +278,7 @@ gimp_rc_load (GimpRc *rc) |
80 |
{ |
81 |
if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT) |
82 |
{ |
83 |
- g_message (error->message); |
84 |
+ g_message ("%s", error->message); |
85 |
|
86 |
gimp_config_file_backup_on_error (rc->user_gimprc, "gimprc", NULL); |
87 |
} |
88 |
@@ -524,7 +524,7 @@ gimp_rc_save (GimpRc *rc) |
89 |
header, footer, global, |
90 |
&error)) |
91 |
{ |
92 |
- g_message (error->message); |
93 |
+ g_message ("%s", error->message); |
94 |
g_error_free (error); |
95 |
} |
96 |
|
97 |
diff -p -up gimp-2.6.4/app/core/gimpcontainer-filter.c.str-fmt gimp-2.6.4/app/core/gimpcontainer-filter.c |
98 |
--- gimp-2.6.4/app/core/gimpcontainer-filter.c.str-fmt 2008-11-20 23:42:58.000000000 +0100 |
99 |
+++ gimp-2.6.4/app/core/gimpcontainer-filter.c 2009-01-02 09:32:48.000000000 +0100 |
100 |
@@ -166,7 +166,7 @@ gimp_container_get_filtered_name_array ( |
101 |
} |
102 |
else |
103 |
{ |
104 |
- g_warning (error->message); |
105 |
+ g_warning ("%s", error->message); |
106 |
g_error_free (error); |
107 |
|
108 |
*length = 0; |
109 |
diff -p -up gimp-2.6.4/app/dialogs/convert-dialog.c.str-fmt gimp-2.6.4/app/dialogs/convert-dialog.c |
110 |
--- gimp-2.6.4/app/dialogs/convert-dialog.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
111 |
+++ gimp-2.6.4/app/dialogs/convert-dialog.c 2009-01-02 09:32:48.000000000 +0100 |
112 |
@@ -298,6 +298,7 @@ convert_dialog_response (GtkWidget * |
113 |
{ |
114 |
gimp_message (dialog->image->gimp, G_OBJECT (dialog->dialog), |
115 |
GIMP_MESSAGE_WARNING, |
116 |
+ "%s", |
117 |
error->message); |
118 |
g_clear_error (&error); |
119 |
|
120 |
diff -p -up gimp-2.6.4/app/dialogs/preferences-dialog.c.str-fmt gimp-2.6.4/app/dialogs/preferences-dialog.c |
121 |
--- gimp-2.6.4/app/dialogs/preferences-dialog.c.str-fmt 2008-12-28 00:13:03.000000000 +0100 |
122 |
+++ gimp-2.6.4/app/dialogs/preferences-dialog.c 2009-01-02 09:32:48.000000000 +0100 |
123 |
@@ -1362,6 +1362,7 @@ prefs_message (GtkMessageType type, |
124 |
destroy_with_parent ? |
125 |
GTK_DIALOG_DESTROY_WITH_PARENT : 0, |
126 |
type, GTK_BUTTONS_OK, |
127 |
+ "%s", |
128 |
message); |
129 |
|
130 |
g_signal_connect (dialog, "response", |
131 |
diff -p -up gimp-2.6.4/app/dialogs/quit-dialog.c.str-fmt gimp-2.6.4/app/dialogs/quit-dialog.c |
132 |
--- gimp-2.6.4/app/dialogs/quit-dialog.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
133 |
+++ gimp-2.6.4/app/dialogs/quit-dialog.c 2009-01-02 09:32:48.000000000 +0100 |
134 |
@@ -216,7 +216,7 @@ quit_close_all_dialog_container_changed |
135 |
text = g_strdup_printf (ngettext ("There is one image with unsaved changes:", |
136 |
"There are %d images with unsaved changes:", |
137 |
num_images), num_images); |
138 |
- gimp_message_box_set_primary_text (box, text); |
139 |
+ gimp_message_box_set_primary_text (box, "%s", text); |
140 |
g_free (text); |
141 |
|
142 |
if (num_images == 0) |
143 |
diff -p -up gimp-2.6.4/app/dialogs/stroke-dialog.c.str-fmt gimp-2.6.4/app/dialogs/stroke-dialog.c |
144 |
--- gimp-2.6.4/app/dialogs/stroke-dialog.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
145 |
+++ gimp-2.6.4/app/dialogs/stroke-dialog.c 2009-01-02 09:32:48.000000000 +0100 |
146 |
@@ -321,6 +321,7 @@ stroke_dialog_response (GtkWidget *widg |
147 |
gimp_message (context->gimp, |
148 |
G_OBJECT (widget), |
149 |
GIMP_MESSAGE_WARNING, |
150 |
+ "%s", |
151 |
error ? error->message : "NULL"); |
152 |
g_clear_error (&error); |
153 |
return; |
154 |
diff -p -up gimp-2.6.4/app/errors.c.str-fmt gimp-2.6.4/app/errors.c |
155 |
--- gimp-2.6.4/app/errors.c.str-fmt 2008-11-20 23:43:08.000000000 +0100 |
156 |
+++ gimp-2.6.4/app/errors.c 2009-01-02 09:32:48.000000000 +0100 |
157 |
@@ -185,7 +185,7 @@ gimp_error_log_func (const gchar *dom |
158 |
const gchar *message, |
159 |
gpointer data) |
160 |
{ |
161 |
- gimp_fatal_error (message); |
162 |
+ gimp_fatal_error ("%s", message); |
163 |
} |
164 |
|
165 |
static void |
166 |
diff -p -up gimp-2.6.4/app/file/file-open.c.str-fmt gimp-2.6.4/app/file/file-open.c |
167 |
--- gimp-2.6.4/app/file/file-open.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
168 |
+++ gimp-2.6.4/app/file/file-open.c 2009-01-02 09:32:48.000000000 +0100 |
169 |
@@ -135,7 +135,7 @@ file_open_image (Gimp *gi |
170 |
if (g_access (filename, R_OK) != 0) |
171 |
{ |
172 |
g_free (filename); |
173 |
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_ACCES, |
174 |
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_ACCES, "%s", |
175 |
g_strerror (errno)); |
176 |
return NULL; |
177 |
} |
178 |
@@ -617,13 +617,13 @@ file_open_profile_apply_rgb (GimpImage |
179 |
g_object_set (config, "mode", GIMP_COLOR_MANAGEMENT_OFF, NULL); |
180 |
|
181 |
gimp_message (image->gimp, G_OBJECT (progress), |
182 |
- GIMP_MESSAGE_WARNING, msg); |
183 |
+ GIMP_MESSAGE_WARNING, "%s", msg); |
184 |
g_free (msg); |
185 |
} |
186 |
else |
187 |
{ |
188 |
gimp_message (image->gimp, G_OBJECT (progress), |
189 |
- GIMP_MESSAGE_ERROR, error->message); |
190 |
+ GIMP_MESSAGE_ERROR, "%s", error->message); |
191 |
} |
192 |
|
193 |
g_error_free (error); |
194 |
diff -p -up gimp-2.6.4/app/gui/gui.c.str-fmt gimp-2.6.4/app/gui/gui.c |
195 |
--- gimp-2.6.4/app/gui/gui.c.str-fmt 2008-11-20 23:43:00.000000000 +0100 |
196 |
+++ gimp-2.6.4/app/gui/gui.c 2009-01-02 09:32:48.000000000 +0100 |
197 |
@@ -167,7 +167,7 @@ gui_abort (const gchar *abort_message) |
198 |
"border-width", 12, |
199 |
NULL); |
200 |
|
201 |
- gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), abort_message); |
202 |
+ gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), "%s", abort_message); |
203 |
|
204 |
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), box); |
205 |
gtk_widget_show (box); |
206 |
diff -p -up gimp-2.6.4/app/gui/gui-message.c.str-fmt gimp-2.6.4/app/gui/gui-message.c |
207 |
--- gimp-2.6.4/app/gui/gui-message.c.str-fmt 2008-11-20 23:43:00.000000000 +0100 |
208 |
+++ gimp-2.6.4/app/gui/gui-message.c 2009-01-02 09:32:48.000000000 +0100 |
209 |
@@ -218,7 +218,7 @@ gui_message_error_dialog (Gimp |
210 |
dialog = |
211 |
gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (parent)), |
212 |
GTK_DIALOG_DESTROY_WITH_PARENT, |
213 |
- type, GTK_BUTTONS_OK, |
214 |
+ type, GTK_BUTTONS_OK, "%s", |
215 |
message); |
216 |
|
217 |
g_signal_connect (dialog, "response", |
218 |
diff -p -up gimp-2.6.4/app/main.c.str-fmt gimp-2.6.4/app/main.c |
219 |
--- gimp-2.6.4/app/main.c.str-fmt 2008-11-20 23:43:08.000000000 +0100 |
220 |
+++ gimp-2.6.4/app/main.c 2009-01-02 09:32:48.000000000 +0100 |
221 |
@@ -691,14 +691,14 @@ gimp_sigfatal_handler (gint sig_num) |
222 |
case SIGQUIT: |
223 |
case SIGABRT: |
224 |
case SIGTERM: |
225 |
- gimp_terminate (g_strsignal (sig_num)); |
226 |
+ gimp_terminate ("%s", g_strsignal (sig_num)); |
227 |
break; |
228 |
|
229 |
case SIGBUS: |
230 |
case SIGSEGV: |
231 |
case SIGFPE: |
232 |
default: |
233 |
- gimp_fatal_error (g_strsignal (sig_num)); |
234 |
+ gimp_fatal_error ("%s", g_strsignal (sig_num)); |
235 |
break; |
236 |
} |
237 |
} |
238 |
diff -p -up gimp-2.6.4/app/plug-in/gimppluginprocedure.c.str-fmt gimp-2.6.4/app/plug-in/gimppluginprocedure.c |
239 |
--- gimp-2.6.4/app/plug-in/gimppluginprocedure.c.str-fmt 2008-11-20 23:43:08.000000000 +0100 |
240 |
+++ gimp-2.6.4/app/plug-in/gimppluginprocedure.c 2009-01-02 09:32:48.000000000 +0100 |
241 |
@@ -658,7 +658,7 @@ gimp_plug_in_procedure_get_pixbuf (const |
242 |
|
243 |
if (! pixbuf && error) |
244 |
{ |
245 |
- g_printerr (error->message); |
246 |
+ g_printerr ("%s", error->message); |
247 |
g_clear_error (&error); |
248 |
} |
249 |
|
250 |
diff -p -up gimp-2.6.4/app/tools/gimpaligntool.c.str-fmt gimp-2.6.4/app/tools/gimpaligntool.c |
251 |
--- gimp-2.6.4/app/tools/gimpaligntool.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
252 |
+++ gimp-2.6.4/app/tools/gimpaligntool.c 2009-01-02 09:32:48.000000000 +0100 |
253 |
@@ -633,7 +633,7 @@ gimp_align_tool_status_update (GimpTool |
254 |
} |
255 |
|
256 |
if (status) |
257 |
- gimp_tool_push_status (tool, display, status); |
258 |
+ gimp_tool_push_status (tool, display, "%s", status); |
259 |
|
260 |
if (free_status) |
261 |
g_free ((gchar *) status); |
262 |
diff -p -up gimp-2.6.4/app/tools/gimpbucketfilltool.c.str-fmt gimp-2.6.4/app/tools/gimpbucketfilltool.c |
263 |
--- gimp-2.6.4/app/tools/gimpbucketfilltool.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
264 |
+++ gimp-2.6.4/app/tools/gimpbucketfilltool.c 2009-01-02 09:32:48.000000000 +0100 |
265 |
@@ -157,7 +157,7 @@ gimp_bucket_fill_tool_button_release (Gi |
266 |
x, y, &error)) |
267 |
{ |
268 |
gimp_message (display->image->gimp, G_OBJECT (display), |
269 |
- GIMP_MESSAGE_WARNING, |
270 |
+ GIMP_MESSAGE_WARNING, "%s", |
271 |
error->message); |
272 |
g_clear_error (&error); |
273 |
} |
274 |
diff -p -up gimp-2.6.4/app/tools/gimpcolorpickertool.c.str-fmt gimp-2.6.4/app/tools/gimpcolorpickertool.c |
275 |
--- gimp-2.6.4/app/tools/gimpcolorpickertool.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
276 |
+++ gimp-2.6.4/app/tools/gimpcolorpickertool.c 2009-01-02 09:32:48.000000000 +0100 |
277 |
@@ -270,7 +270,7 @@ gimp_color_picker_tool_oper_update (Gimp |
278 |
} |
279 |
if (status_help != NULL) |
280 |
{ |
281 |
- gimp_tool_push_status (tool, display, status_help); |
282 |
+ gimp_tool_push_status (tool, display, "%s", status_help); |
283 |
g_free (status_help); |
284 |
} |
285 |
} |
286 |
diff -p -up gimp-2.6.4/app/tools/gimpcurvestool.c.str-fmt gimp-2.6.4/app/tools/gimpcurvestool.c |
287 |
--- gimp-2.6.4/app/tools/gimpcurvestool.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
288 |
+++ gimp-2.6.4/app/tools/gimpcurvestool.c 2009-01-02 09:32:48.000000000 +0100 |
289 |
@@ -331,7 +331,7 @@ gimp_curves_tool_oper_update (GimpTool |
290 |
GIMP_COLOR_TOOL (tool)->pick_mode = mode; |
291 |
|
292 |
if (status && proximity) |
293 |
- gimp_tool_push_status (tool, display, status); |
294 |
+ gimp_tool_push_status (tool, display, "%s", status); |
295 |
} |
296 |
|
297 |
static void |
298 |
diff -p -up gimp-2.6.4/app/tools/gimpforegroundselecttool.c.str-fmt gimp-2.6.4/app/tools/gimpforegroundselecttool.c |
299 |
--- gimp-2.6.4/app/tools/gimpforegroundselecttool.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
300 |
+++ gimp-2.6.4/app/tools/gimpforegroundselecttool.c 2009-01-02 09:32:48.000000000 +0100 |
301 |
@@ -334,7 +334,7 @@ gimp_foreground_select_tool_oper_update |
302 |
if (proximity) |
303 |
{ |
304 |
if (status) |
305 |
- gimp_tool_replace_status (tool, display, status); |
306 |
+ gimp_tool_replace_status (tool, display, "%s", status); |
307 |
|
308 |
gimp_draw_tool_start (draw_tool, display); |
309 |
} |
310 |
diff -p -up gimp-2.6.4/app/tools/gimpfreeselecttool.c.str-fmt gimp-2.6.4/app/tools/gimpfreeselecttool.c |
311 |
--- gimp-2.6.4/app/tools/gimpfreeselecttool.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
312 |
+++ gimp-2.6.4/app/tools/gimpfreeselecttool.c 2009-01-02 09:32:48.000000000 +0100 |
313 |
@@ -1131,7 +1131,7 @@ gimp_free_select_tool_status_update (Gim |
314 |
|
315 |
if (status_text) |
316 |
{ |
317 |
- gimp_tool_push_status (tool, display, status_text); |
318 |
+ gimp_tool_push_status (tool, display, "%s", status_text); |
319 |
} |
320 |
} |
321 |
} |
322 |
diff -p -up gimp-2.6.4/app/tools/gimpimagemaptool-settings.c.str-fmt gimp-2.6.4/app/tools/gimpimagemaptool-settings.c |
323 |
--- gimp-2.6.4/app/tools/gimpimagemaptool-settings.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
324 |
+++ gimp-2.6.4/app/tools/gimpimagemaptool-settings.c 2009-01-02 09:32:48.000000000 +0100 |
325 |
@@ -179,7 +179,7 @@ gimp_image_map_tool_settings_import (Gim |
326 |
if (! tool_class->settings_import (tool, filename, &error)) |
327 |
{ |
328 |
gimp_message (GIMP_TOOL (tool)->tool_info->gimp, G_OBJECT (tool->shell), |
329 |
- GIMP_MESSAGE_ERROR, error->message); |
330 |
+ GIMP_MESSAGE_ERROR, "%s", error->message); |
331 |
g_clear_error (&error); |
332 |
|
333 |
return FALSE; |
334 |
@@ -208,7 +208,7 @@ gimp_image_map_tool_settings_export (Gim |
335 |
if (! tool_class->settings_export (tool, filename, &error)) |
336 |
{ |
337 |
gimp_message (GIMP_TOOL (tool)->tool_info->gimp, G_OBJECT (tool->shell), |
338 |
- GIMP_MESSAGE_ERROR, error->message); |
339 |
+ GIMP_MESSAGE_ERROR, "%s", error->message); |
340 |
g_clear_error (&error); |
341 |
|
342 |
return FALSE; |
343 |
diff -p -up gimp-2.6.4/app/tools/gimpiscissorstool.c.str-fmt gimp-2.6.4/app/tools/gimpiscissorstool.c |
344 |
--- gimp-2.6.4/app/tools/gimpiscissorstool.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
345 |
+++ gimp-2.6.4/app/tools/gimpiscissorstool.c 2009-01-02 09:32:48.000000000 +0100 |
346 |
@@ -940,7 +940,7 @@ gimp_iscissors_tool_oper_update (GimpToo |
347 |
status = gimp_suggest_modifiers (_("Click-Drag to move this point"), |
348 |
GDK_SHIFT_MASK & ~state, |
349 |
_("%s: disable auto-snap"), NULL, NULL); |
350 |
- gimp_tool_replace_status (tool, display, status); |
351 |
+ gimp_tool_replace_status (tool, display, "%s", status); |
352 |
g_free (status); |
353 |
iscissors->op = ISCISSORS_OP_MOVE_POINT; |
354 |
} |
355 |
@@ -1006,7 +1006,7 @@ gimp_iscissors_tool_oper_update (GimpToo |
356 |
GDK_SHIFT_MASK & ~state, |
357 |
_("%s: disable auto-snap"), |
358 |
NULL, NULL); |
359 |
- gimp_tool_replace_status (tool, display, status); |
360 |
+ gimp_tool_replace_status (tool, display, "%s", status); |
361 |
g_free (status); |
362 |
} |
363 |
iscissors->op = ISCISSORS_OP_ADD_POINT; |
364 |
diff -p -up gimp-2.6.4/app/tools/gimpmeasuretool.c.str-fmt gimp-2.6.4/app/tools/gimpmeasuretool.c |
365 |
--- gimp-2.6.4/app/tools/gimpmeasuretool.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
366 |
+++ gimp-2.6.4/app/tools/gimpmeasuretool.c 2009-01-02 09:32:48.000000000 +0100 |
367 |
@@ -569,7 +569,7 @@ gimp_measure_tool_cursor_update (GimpToo |
368 |
GDK_MOD1_MASK & ~state, |
369 |
NULL, NULL, NULL); |
370 |
} |
371 |
- gimp_tool_replace_status (tool, display, status); |
372 |
+ gimp_tool_replace_status (tool, display, "%s", status); |
373 |
g_free (status); |
374 |
measure->status_help = TRUE; |
375 |
break; |
376 |
@@ -582,7 +582,7 @@ gimp_measure_tool_cursor_update (GimpToo |
377 |
"vertical guide"), |
378 |
GDK_CONTROL_MASK & ~state, |
379 |
NULL, NULL, NULL); |
380 |
- gimp_tool_replace_status (tool, display, status); |
381 |
+ gimp_tool_replace_status (tool, display, "%s", status); |
382 |
g_free (status); |
383 |
measure->status_help = TRUE; |
384 |
break; |
385 |
@@ -610,7 +610,7 @@ gimp_measure_tool_cursor_update (GimpToo |
386 |
| GDK_MOD1_MASK) & ~state, |
387 |
NULL, NULL, NULL); |
388 |
} |
389 |
- gimp_tool_replace_status (tool, display, status); |
390 |
+ gimp_tool_replace_status (tool, display, "%s", status); |
391 |
g_free (status); |
392 |
measure->status_help = TRUE; |
393 |
break; |
394 |
diff -p -up gimp-2.6.4/app/tools/gimppainttool.c.str-fmt gimp-2.6.4/app/tools/gimppainttool.c |
395 |
--- gimp-2.6.4/app/tools/gimppainttool.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
396 |
+++ gimp-2.6.4/app/tools/gimppainttool.c 2009-01-02 09:32:48.000000000 +0100 |
397 |
@@ -325,7 +325,7 @@ gimp_paint_tool_button_press (GimpTool |
398 |
if (! gimp_paint_core_start (core, drawable, paint_options, &curr_coords, |
399 |
&error)) |
400 |
{ |
401 |
- gimp_tool_message (tool, display, error->message); |
402 |
+ gimp_tool_message (tool, display, "%s", error->message); |
403 |
g_clear_error (&error); |
404 |
return; |
405 |
} |
406 |
@@ -662,7 +662,7 @@ gimp_paint_tool_oper_update (GimpTool |
407 |
_("%s for a straight line"), |
408 |
paint_tool->status_ctrl, |
409 |
NULL); |
410 |
- gimp_tool_push_status (tool, display, status); |
411 |
+ gimp_tool_push_status (tool, display, "%s", status); |
412 |
g_free (status); |
413 |
|
414 |
paint_tool->draw_line = FALSE; |
415 |
diff -p -up gimp-2.6.4/app/tools/gimpselectiontool.c.str-fmt gimp-2.6.4/app/tools/gimpselectiontool.c |
416 |
--- gimp-2.6.4/app/tools/gimpselectiontool.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
417 |
+++ gimp-2.6.4/app/tools/gimpselectiontool.c 2009-01-02 09:32:48.000000000 +0100 |
418 |
@@ -313,7 +313,7 @@ gimp_selection_tool_oper_update (GimpToo |
419 |
} |
420 |
|
421 |
if (status) |
422 |
- gimp_tool_push_status (tool, display, status); |
423 |
+ gimp_tool_push_status (tool, display, "%s", status); |
424 |
|
425 |
if (free_status) |
426 |
g_free ((gchar *) status); |
427 |
diff -p -up gimp-2.6.4/app/tools/gimpsourcetool.c.str-fmt gimp-2.6.4/app/tools/gimpsourcetool.c |
428 |
--- gimp-2.6.4/app/tools/gimpsourcetool.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
429 |
+++ gimp-2.6.4/app/tools/gimpsourcetool.c 2009-01-02 09:32:48.000000000 +0100 |
430 |
@@ -312,7 +312,7 @@ gimp_source_tool_oper_update (GimpTool |
431 |
if (source->src_drawable == NULL) |
432 |
{ |
433 |
if (state & GDK_CONTROL_MASK) |
434 |
- gimp_tool_replace_status (tool, display, |
435 |
+ gimp_tool_replace_status (tool, display, "%s", |
436 |
source_tool->status_set_source); |
437 |
else |
438 |
{ |
439 |
@@ -322,7 +322,7 @@ gimp_source_tool_oper_update (GimpTool |
440 |
gimp_get_mod_separator (), |
441 |
source_tool->status_set_source, |
442 |
NULL); |
443 |
- gimp_tool_replace_status (tool, display, status); |
444 |
+ gimp_tool_replace_status (tool, display, "%s", status); |
445 |
g_free (status); |
446 |
} |
447 |
} |
448 |
diff -p -up gimp-2.6.4/app/tools/gimptool.c.str-fmt gimp-2.6.4/app/tools/gimptool.c |
449 |
--- gimp-2.6.4/app/tools/gimptool.c.str-fmt 2008-12-28 00:13:03.000000000 +0100 |
450 |
+++ gimp-2.6.4/app/tools/gimptool.c 2009-01-02 09:33:12.000000000 +0100 |
451 |
@@ -429,7 +429,7 @@ gimp_tool_initialize (GimpTool *tool, |
452 |
{ |
453 |
if (error) |
454 |
{ |
455 |
- gimp_tool_message (tool, display, error->message); |
456 |
+ gimp_tool_message (tool, display, "%s", error->message); |
457 |
g_clear_error (&error); |
458 |
} |
459 |
|
460 |
diff -p -up gimp-2.6.4/app/tools/gimptransformtool.c.str-fmt gimp-2.6.4/app/tools/gimptransformtool.c |
461 |
--- gimp-2.6.4/app/tools/gimptransformtool.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
462 |
+++ gimp-2.6.4/app/tools/gimptransformtool.c 2009-01-02 09:32:48.000000000 +0100 |
463 |
@@ -1179,7 +1179,7 @@ gimp_transform_tool_doit (GimpTransformT |
464 |
|
465 |
if (! active_item) |
466 |
{ |
467 |
- gimp_tool_message (tool, display, message); |
468 |
+ gimp_tool_message (tool, display, "%s", message); |
469 |
return; |
470 |
} |
471 |
|
472 |
diff -p -up gimp-2.6.4/app/tools/gimpvectortool.c.str-fmt gimp-2.6.4/app/tools/gimpvectortool.c |
473 |
--- gimp-2.6.4/app/tools/gimpvectortool.c.str-fmt 2008-11-20 23:42:59.000000000 +0100 |
474 |
+++ gimp-2.6.4/app/tools/gimpvectortool.c 2009-01-02 09:32:48.000000000 +0100 |
475 |
@@ -1265,7 +1265,7 @@ gimp_vector_tool_status_update (GimpTool |
476 |
} |
477 |
|
478 |
if (status) |
479 |
- gimp_tool_push_status (tool, display, status); |
480 |
+ gimp_tool_push_status (tool, display, "%s", status); |
481 |
|
482 |
if (free_status) |
483 |
g_free ((gchar *) status); |
484 |
diff -p -up gimp-2.6.4/app/widgets/gimpcontrollerlist.c.str-fmt gimp-2.6.4/app/widgets/gimpcontrollerlist.c |
485 |
--- gimp-2.6.4/app/widgets/gimpcontrollerlist.c.str-fmt 2008-11-20 23:43:05.000000000 +0100 |
486 |
+++ gimp-2.6.4/app/widgets/gimpcontrollerlist.c 2009-01-02 09:32:48.000000000 +0100 |
487 |
@@ -576,9 +576,9 @@ gimp_controller_list_remove_clicked (Gtk |
488 |
"Selecting \"Disable Controller\" will disable " |
489 |
"the controller without removing it.")); |
490 |
|
491 |
- gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box, |
492 |
+ gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box, "%s", |
493 |
primary); |
494 |
- gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box, |
495 |
+ gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box, "%s", |
496 |
secondary); |
497 |
|
498 |
g_free (primary); |
499 |
diff -p -up gimp-2.6.4/app/widgets/gimperrordialog.c.str-fmt gimp-2.6.4/app/widgets/gimperrordialog.c |
500 |
--- gimp-2.6.4/app/widgets/gimperrordialog.c.str-fmt 2008-11-20 23:43:05.000000000 +0100 |
501 |
+++ gimp-2.6.4/app/widgets/gimperrordialog.c 2009-01-02 09:32:48.000000000 +0100 |
502 |
@@ -165,7 +165,7 @@ gimp_error_dialog_add (GimpErrorDialog * |
503 |
dialog->num_messages++; |
504 |
|
505 |
if (overflow) |
506 |
- gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box), domain); |
507 |
+ gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box), "%s", domain); |
508 |
else |
509 |
gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box), |
510 |
_("%s Message"), domain); |
511 |
diff -p -up gimp-2.6.4/app/widgets/gimphelp.c.str-fmt gimp-2.6.4/app/widgets/gimphelp.c |
512 |
--- gimp-2.6.4/app/widgets/gimphelp.c.str-fmt 2008-11-20 23:43:05.000000000 +0100 |
513 |
+++ gimp-2.6.4/app/widgets/gimphelp.c 2009-01-02 09:32:48.000000000 +0100 |
514 |
@@ -361,9 +361,9 @@ gimp_help_browser_error (Gimp *g |
515 |
gimp_window_set_transient_for (GTK_WINDOW (dialog), window); |
516 |
} |
517 |
|
518 |
- gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box, |
519 |
+ gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box, "%s", |
520 |
primary); |
521 |
- gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box, text); |
522 |
+ gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box, "%s", text); |
523 |
|
524 |
if (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK) |
525 |
{ |
526 |
diff -p -up gimp-2.6.4/app/widgets/gimpwidgets-utils.c.str-fmt gimp-2.6.4/app/widgets/gimpwidgets-utils.c |
527 |
--- gimp-2.6.4/app/widgets/gimpwidgets-utils.c.str-fmt 2008-11-20 23:43:05.000000000 +0100 |
528 |
+++ gimp-2.6.4/app/widgets/gimpwidgets-utils.c 2009-01-02 09:32:48.000000000 +0100 |
529 |
@@ -849,7 +849,7 @@ gimp_text_buffer_load (GtkTextBuffer *b |
530 |
|
531 |
if (! file) |
532 |
{ |
533 |
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), |
534 |
+ g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), "%s", |
535 |
g_strerror (errno)); |
536 |
return FALSE; |
537 |
} |
538 |
@@ -906,7 +906,7 @@ gimp_text_buffer_save (GtkTextBuffer *b |
539 |
|
540 |
if (fd == -1) |
541 |
{ |
542 |
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), |
543 |
+ g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), "%s", |
544 |
g_strerror (errno)); |
545 |
return FALSE; |
546 |
} |
547 |
@@ -933,7 +933,7 @@ gimp_text_buffer_save (GtkTextBuffer *b |
548 |
{ |
549 |
g_free (text_contents); |
550 |
close (fd); |
551 |
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), |
552 |
+ g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), "%s", |
553 |
g_strerror (errno)); |
554 |
return FALSE; |
555 |
} |
556 |
diff -p -up gimp-2.6.4/libgimpconfig/gimpconfigwriter.c.str-fmt gimp-2.6.4/libgimpconfig/gimpconfigwriter.c |
557 |
--- gimp-2.6.4/libgimpconfig/gimpconfigwriter.c.str-fmt 2008-11-20 23:43:52.000000000 +0100 |
558 |
+++ gimp-2.6.4/libgimpconfig/gimpconfigwriter.c 2009-01-02 09:32:48.000000000 +0100 |
559 |
@@ -567,7 +567,7 @@ gimp_config_writer_linefeed (GimpConfigW |
560 |
if (writer->buffer->len == 0 && !writer->comment) |
561 |
{ |
562 |
if (write (writer->fd, "\n", 1) < 0) |
563 |
- g_set_error (&writer->error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_WRITE, |
564 |
+ g_set_error (&writer->error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_WRITE, "%s", |
565 |
g_strerror (errno)); |
566 |
} |
567 |
else |
568 |
diff -p -up gimp-2.6.4/libgimpthumb/gimpthumbnail.c.str-fmt gimp-2.6.4/libgimpthumb/gimpthumbnail.c |
569 |
--- gimp-2.6.4/libgimpthumb/gimpthumbnail.c.str-fmt 2008-11-20 23:43:08.000000000 +0100 |
570 |
+++ gimp-2.6.4/libgimpthumb/gimpthumbnail.c 2009-01-02 09:32:48.000000000 +0100 |
571 |
@@ -830,7 +830,7 @@ gimp_thumbnail_save (GimpThumbnail *thu |
572 |
if (thumbnail->image_mimetype) |
573 |
{ |
574 |
keys[i] = TAG_THUMB_MIMETYPE; |
575 |
- values[i] = g_strdup_printf (thumbnail->image_mimetype); |
576 |
+ values[i] = g_strdup_printf ("%s", thumbnail->image_mimetype); |
577 |
i++; |
578 |
} |
579 |
|
580 |
diff -p -up gimp-2.6.4/plug-ins/common/lcms.c.str-fmt gimp-2.6.4/plug-ins/common/lcms.c |
581 |
--- gimp-2.6.4/plug-ins/common/lcms.c.str-fmt 2008-11-20 23:43:49.000000000 +0100 |
582 |
+++ gimp-2.6.4/plug-ins/common/lcms.c 2009-01-02 09:32:48.000000000 +0100 |
583 |
@@ -802,7 +802,7 @@ lcms_image_set_profile (gint32 ima |
584 |
|
585 |
if (! file) |
586 |
{ |
587 |
- g_message (error->message); |
588 |
+ g_message ("%s", error->message); |
589 |
g_error_free (error); |
590 |
|
591 |
return FALSE; |
592 |
@@ -1107,7 +1107,7 @@ lcms_load_profile (const gchar *filename |
593 |
|
594 |
if (! file) |
595 |
{ |
596 |
- g_message (error->message); |
597 |
+ g_message ("%s", error->message); |
598 |
g_error_free (error); |
599 |
|
600 |
return NULL; |
601 |
diff -p -up gimp-2.6.4/plug-ins/common/mail.c.str-fmt gimp-2.6.4/plug-ins/common/mail.c |
602 |
--- gimp-2.6.4/plug-ins/common/mail.c.str-fmt 2008-11-20 23:43:49.000000000 +0100 |
603 |
+++ gimp-2.6.4/plug-ins/common/mail.c 2009-01-02 09:32:48.000000000 +0100 |
604 |
@@ -352,7 +352,7 @@ save_image (const gchar *filename, |
605 |
|
606 |
if (! to64 (tmpname, mailpipe, &error)) |
607 |
{ |
608 |
- g_message (error->message); |
609 |
+ g_message ("%s", error->message); |
610 |
g_error_free (error); |
611 |
goto error; |
612 |
} |
613 |
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 |
614 |
--- gimp-2.6.4/plug-ins/file-bmp/bmp-write.c.str-fmt 2008-11-20 23:43:42.000000000 +0100 |
615 |
+++ gimp-2.6.4/plug-ins/file-bmp/bmp-write.c 2009-01-02 09:32:48.000000000 +0100 |
616 |
@@ -123,9 +123,10 @@ warning_dialog (const gchar *primary, |
617 |
|
618 |
dialog = gtk_message_dialog_new (NULL, 0, |
619 |
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, |
620 |
+ "%s", |
621 |
primary); |
622 |
|
623 |
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), |
624 |
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", |
625 |
secondary); |
626 |
|
627 |
gimp_window_set_transient (GTK_WINDOW (dialog)); |
628 |
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 |
629 |
--- gimp-2.6.4/plug-ins/file-fits/fits.c.str-fmt 2008-11-20 23:43:41.000000000 +0100 |
630 |
+++ gimp-2.6.4/plug-ins/file-fits/fits.c 2009-01-02 09:32:48.000000000 +0100 |
631 |
@@ -1065,5 +1065,5 @@ show_fits_errors (void) |
632 |
|
633 |
/* Write out error messages of FITS-Library */ |
634 |
while ((msg = fits_get_error ()) != NULL) |
635 |
- g_message (msg); |
636 |
+ g_message ("%s", msg); |
637 |
} |
638 |
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 |
639 |
--- gimp-2.6.4/plug-ins/file-jpeg/jpeg.c.str-fmt 2009-01-01 15:03:33.000000000 +0100 |
640 |
+++ gimp-2.6.4/plug-ins/file-jpeg/jpeg.c 2009-01-02 09:32:48.000000000 +0100 |
641 |
@@ -564,5 +564,5 @@ my_output_message (j_common_ptr cinfo) |
642 |
gchar buffer[JMSG_LENGTH_MAX + 1]; |
643 |
|
644 |
(*cinfo->err->format_message)(cinfo, buffer); |
645 |
- g_message (buffer); |
646 |
+ g_message ("%s", buffer); |
647 |
} |
648 |
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 |
649 |
--- gimp-2.6.4/plug-ins/file-uri/uri.c.str-fmt 2008-11-20 23:43:49.000000000 +0100 |
650 |
+++ gimp-2.6.4/plug-ins/file-uri/uri.c 2009-01-02 09:32:48.000000000 +0100 |
651 |
@@ -102,7 +102,7 @@ query (void) |
652 |
|
653 |
if (! uri_backend_init (PLUG_IN_BINARY, FALSE, 0, &error)) |
654 |
{ |
655 |
- g_message (error->message); |
656 |
+ g_message ("%s", error->message); |
657 |
g_clear_error (&error); |
658 |
|
659 |
return; |
660 |
diff -p -up gimp-2.6.4/plug-ins/help/gimphelpdomain.c.str-fmt gimp-2.6.4/plug-ins/help/gimphelpdomain.c |
661 |
--- gimp-2.6.4/plug-ins/help/gimphelpdomain.c.str-fmt 2008-11-20 23:43:49.000000000 +0100 |
662 |
+++ gimp-2.6.4/plug-ins/help/gimphelpdomain.c 2009-01-02 09:32:48.000000000 +0100 |
663 |
@@ -202,7 +202,7 @@ gimp_help_domain_map (GimpHelpDomain |
664 |
break; |
665 |
|
666 |
default: |
667 |
- g_message (error->message); |
668 |
+ g_message ("%s", error->message); |
669 |
break; |
670 |
} |
671 |
|
672 |
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 |
673 |
--- gimp-2.6.4/plug-ins/ifs-compose/ifs-compose.c.str-fmt 2008-11-20 23:43:42.000000000 +0100 |
674 |
+++ gimp-2.6.4/plug-ins/ifs-compose/ifs-compose.c 2009-01-02 09:32:48.000000000 +0100 |
675 |
@@ -2341,7 +2341,7 @@ ifscompose_message_dialog (GtkMessageTyp |
676 |
{ |
677 |
GtkWidget *dialog; |
678 |
|
679 |
- dialog = gtk_message_dialog_new (parent, 0, type, GTK_BUTTONS_OK, message); |
680 |
+ dialog = gtk_message_dialog_new (parent, 0, type, GTK_BUTTONS_OK, "%s", message); |
681 |
|
682 |
if (title) |
683 |
gtk_window_set_title (GTK_WINDOW (dialog), title); |
684 |
diff -p -up gimp-2.6.4/plug-ins/print/print.c.str-fmt gimp-2.6.4/plug-ins/print/print.c |
685 |
--- gimp-2.6.4/plug-ins/print/print.c.str-fmt 2008-11-20 23:43:49.000000000 +0100 |
686 |
+++ gimp-2.6.4/plug-ins/print/print.c 2009-01-02 09:32:48.000000000 +0100 |
687 |
@@ -347,7 +347,7 @@ print_show_error (const gchar *message) |
688 |
GTK_BUTTONS_OK, |
689 |
_("An error occurred while trying to print:")); |
690 |
|
691 |
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), |
692 |
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", |
693 |
message); |
694 |
|
695 |
gtk_dialog_run (GTK_DIALOG (dialog)); |