callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: clean out a big bunch of leading tabs.

Browse Source 
For some unknown reason, most calls to gimp_message_literal() were
indented with tabs.
This commit is contained in:
Jehan
2013-09-15 04:59:20 +12:00
parent b74623090b
commit c7aa623a55
40 changed files with 179 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/actions/documents-commands.c
View File

@ -275,8 +275,8 @@ documents_recreate_preview_cmd_callback (GtkAction *action,
FALSE, &error)) FALSE, &error))
{ {
gimp_message_literal (context->gimp, gimp_message_literal (context->gimp,
NULL , GIMP_MESSAGE_ERROR, NULL , GIMP_MESSAGE_ERROR,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }

4
app/actions/drawable-commands.c
View File

@ -105,8 +105,8 @@ drawable_levels_stretch_cmd_callback (GtkAction *action,
if (! gimp_drawable_is_rgb (drawable)) if (! gimp_drawable_is_rgb (drawable))
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
_("White Balance operates only on RGB color layers.")); _("White Balance operates only on RGB color layers."));
return; return;
} }

48
app/actions/edit-commands.c
View File

@ -214,17 +214,17 @@ edit_cut_cmd_callback (GtkAction *action,
if (display) if (display)
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (display), GIMP_MESSAGE_INFO, G_OBJECT (display), GIMP_MESSAGE_INFO,
_("Cut pixels to the clipboard")); _("Cut pixels to the clipboard"));
gimp_image_flush (image); gimp_image_flush (image);
} }
else else
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (action_data_get_display (data)), G_OBJECT (action_data_get_display (data)),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }
@ -244,17 +244,17 @@ edit_copy_cmd_callback (GtkAction *action,
if (display) if (display)
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (display), GIMP_MESSAGE_INFO, G_OBJECT (display), GIMP_MESSAGE_INFO,
_("Copied pixels to the clipboard")); _("Copied pixels to the clipboard"));
gimp_image_flush (image); gimp_image_flush (image);
} }
else else
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (action_data_get_display (data)), G_OBJECT (action_data_get_display (data)),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }
@ -273,17 +273,17 @@ edit_copy_visible_cmd_callback (GtkAction *action,
if (display) if (display)
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (display), GIMP_MESSAGE_INFO, G_OBJECT (display), GIMP_MESSAGE_INFO,
_("Copied pixels to the clipboard")); _("Copied pixels to the clipboard"));
gimp_image_flush (image); gimp_image_flush (image);
} }
else else
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (action_data_get_display (data)), G_OBJECT (action_data_get_display (data)),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }
@ -334,7 +334,7 @@ edit_paste_as_new_cmd_callback (GtkAction *action,
else else
{ {
gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING, gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING,
_("There is no image data in the clipboard to paste.")); _("There is no image data in the clipboard to paste."));
} }
} }
@ -370,7 +370,7 @@ edit_paste_as_new_layer_cmd_callback (GtkAction *action,
else else
{ {
gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING, gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING,
_("There is no image data in the clipboard to paste.")); _("There is no image data in the clipboard to paste."));
} }
} }
@ -552,8 +552,8 @@ edit_paste (GimpDisplay *display,
else else
{ {
gimp_message_literal (display->gimp, G_OBJECT (display), gimp_message_literal (display->gimp, G_OBJECT (display),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
_("There is no image data in the clipboard to paste.")); _("There is no image data in the clipboard to paste."));
} }
} }
} }
@ -570,7 +570,7 @@ cut_named_buffer_callback (GtkWidget *widget,
if (! drawable) if (! drawable)
{ {
gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING, gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
_("There is no active layer or channel to cut from.")); _("There is no active layer or channel to cut from."));
return; return;
} }
@ -585,7 +585,7 @@ cut_named_buffer_callback (GtkWidget *widget,
else else
{ {
gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING, gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }
@ -602,7 +602,7 @@ copy_named_buffer_callback (GtkWidget *widget,
if (! drawable) if (! drawable)
{ {
gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING, gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
_("There is no active layer or channel to copy from.")); _("There is no active layer or channel to copy from."));
return; return;
} }
@ -617,7 +617,7 @@ copy_named_buffer_callback (GtkWidget *widget,
else else
{ {
gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING, gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }
@ -642,7 +642,7 @@ copy_named_visible_buffer_callback (GtkWidget *widget,
else else
{ {
gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING, gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }

4
app/actions/error-console-commands.c
View File

@ -80,8 +80,8 @@ error_console_save_cmd_callback (GtkAction *action,
NULL, NULL)) NULL, NULL))
{ {
gimp_message_literal (console->gimp, gimp_message_literal (console->gimp,
G_OBJECT (console), GIMP_MESSAGE_WARNING, G_OBJECT (console), GIMP_MESSAGE_WARNING,
_("Cannot save. Nothing is selected.")); _("Cannot save. Nothing is selected."));
return; return;
} }

10
app/actions/file-commands.c
View File

@ -268,8 +268,8 @@ file_save_cmd_callback (GtkAction *action,
else else
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (display), GIMP_MESSAGE_INFO, G_OBJECT (display), GIMP_MESSAGE_INFO,
_("No changes need to be saved")); _("No changes need to be saved"));
saved = TRUE; saved = TRUE;
break; break;
} }
@ -400,9 +400,9 @@ file_revert_cmd_callback (GtkAction *action,
if (! uri) if (! uri)
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (display), GIMP_MESSAGE_ERROR, G_OBJECT (display), GIMP_MESSAGE_ERROR,
_("Revert failed. " _("Revert failed. "
"No file name associated with this image.")); "No file name associated with this image."));
} }
else if (dialog) else if (dialog)
{ {

4
app/actions/gradients-commands.c
View File

@ -131,8 +131,8 @@ gradients_save_as_pov_ray_response (GtkWidget *dialog,
if (! gimp_gradient_save_pov (gradient, filename, &error)) if (! gimp_gradient_save_pov (gradient, filename, &error))
{ {
gimp_message_literal (g_object_get_data (G_OBJECT (dialog), "gimp"), gimp_message_literal (g_object_get_data (G_OBJECT (dialog), "gimp"),
G_OBJECT (dialog), GIMP_MESSAGE_ERROR, G_OBJECT (dialog), GIMP_MESSAGE_ERROR,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
return; return;
} }

12
app/actions/image-commands.c
View File

@ -187,8 +187,8 @@ image_convert_base_type_cmd_callback (GtkAction *action,
NULL, &error)) NULL, &error))
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
return; return;
} }
@ -497,8 +497,8 @@ image_crop_to_selection_cmd_callback (GtkAction *action,
&x1, &y1, &x2, &y2)) &x1, &y1, &x2, &y2))
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
_("Cannot crop because the current selection is empty.")); _("Cannot crop because the current selection is empty."));
return; return;
} }
@ -524,8 +524,8 @@ image_crop_to_content_cmd_callback (GtkAction *action,
&x1, &y1, &x2, &y2)) &x1, &y1, &x2, &y2))
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
_("Cannot crop because the image has no content.")); _("Cannot crop because the image has no content."));
return; return;
} }

22
app/actions/layers-commands.c
View File

@ -236,8 +236,8 @@ layers_new_cmd_callback (GtkAction *action,
if (! floating_sel_to_layer (floating_sel, &error)) if (! floating_sel_to_layer (floating_sel, &error))
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
return; return;
} }
@ -289,7 +289,7 @@ layers_new_last_vals_cmd_callback (GtkAction *action,
if (! floating_sel_to_layer (floating_sel, &error)) if (! floating_sel_to_layer (floating_sel, &error))
{ {
gimp_message_literal (image->gimp, G_OBJECT (widget), gimp_message_literal (image->gimp, G_OBJECT (widget),
GIMP_MESSAGE_WARNING, error->message); GIMP_MESSAGE_WARNING, error->message);
g_clear_error (&error); g_clear_error (&error);
return; return;
} }
@ -689,8 +689,8 @@ layers_crop_to_selection_cmd_callback (GtkAction *action,
&x1, &y1, &x2, &y2)) &x1, &y1, &x2, &y2))
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
_("Cannot crop because the current selection is empty.")); _("Cannot crop because the current selection is empty."));
return; return;
} }
@ -728,8 +728,8 @@ layers_crop_to_content_cmd_callback (GtkAction *action,
&x1, &y1, &x2, &y2)) &x1, &y1, &x2, &y2))
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
_("Cannot crop because the active layer has no content.")); _("Cannot crop because the active layer has no content."));
return; return;
} }
@ -1076,8 +1076,8 @@ layers_edit_layer_response (GtkWidget *widget,
else else
{ {
gimp_message_literal (dialog->image->gimp, gimp_message_literal (dialog->image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
return; return;
@ -1112,8 +1112,8 @@ layers_add_mask_response (GtkWidget *widget,
! dialog->channel) ! dialog->channel)
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
_("Please select a channel first")); _("Please select a channel first"));
return; return;
} }

6
app/actions/palettes-commands.c
View File

@ -104,9 +104,9 @@ palettes_merge_callback (GtkWidget *widget,
if (! sel_list) if (! sel_list)
{ {
gimp_message_literal (gimp, gimp_message_literal (gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
"Can't merge palettes because " "Can't merge palettes because "
"there are no palettes selected."); "there are no palettes selected.");
return; return;
} }

4
app/actions/plug-in-commands.c
View File

@ -309,8 +309,8 @@ plug_in_procedure_execute (GimpPlugInProcedure *procedure,
if (error) if (error)
{ {
gimp_message_literal (gimp, gimp_message_literal (gimp,
G_OBJECT (display), GIMP_MESSAGE_ERROR, G_OBJECT (display), GIMP_MESSAGE_ERROR,
error->message); error->message);
g_error_free (error); g_error_free (error);
} }
else else

16
app/actions/select-commands.c
View File

@ -132,8 +132,8 @@ select_float_cmd_callback (GtkAction *action,
else else
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }
@ -341,8 +341,8 @@ select_stroke_cmd_callback (GtkAction *action,
if (! drawable) if (! drawable)
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
_("There is no active layer or channel to stroke to.")); _("There is no active layer or channel to stroke to."));
return; return;
} }
@ -374,8 +374,8 @@ select_stroke_last_vals_cmd_callback (GtkAction *action,
if (! drawable) if (! drawable)
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
_("There is no active layer or channel to stroke to.")); _("There is no active layer or channel to stroke to."));
return; return;
} }
@ -390,8 +390,8 @@ select_stroke_last_vals_cmd_callback (GtkAction *action,
drawable, context, options, FALSE, TRUE, NULL, &error)) drawable, context, options, FALSE, TRUE, NULL, &error))
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
else else

22
app/actions/vectors-commands.c
View File

@ -289,8 +289,8 @@ vectors_merge_visible_cmd_callback (GtkAction *action,
if (! gimp_image_merge_visible_vectors (image, &error)) if (! gimp_image_merge_visible_vectors (image, &error))
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
return; return;
} }
@ -337,8 +337,8 @@ vectors_selection_to_vectors_cmd_callback (GtkAction *action,
if (! procedure) if (! procedure)
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_ERROR, G_OBJECT (widget), GIMP_MESSAGE_ERROR,
"Selection to path procedure lookup failed."); "Selection to path procedure lookup failed.");
return; return;
} }
@ -362,8 +362,8 @@ vectors_selection_to_vectors_cmd_callback (GtkAction *action,
if (error) if (error)
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_ERROR, G_OBJECT (widget), GIMP_MESSAGE_ERROR,
error->message); error->message);
g_error_free (error); g_error_free (error);
} }
} }
@ -385,8 +385,8 @@ vectors_stroke_cmd_callback (GtkAction *action,
if (! drawable) if (! drawable)
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
_("There is no active layer or channel to stroke to.")); _("There is no active layer or channel to stroke to."));
return; return;
} }
@ -419,8 +419,8 @@ vectors_stroke_last_vals_cmd_callback (GtkAction *action,
if (! drawable) if (! drawable)
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (widget), GIMP_MESSAGE_WARNING, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
_("There is no active layer or channel to stroke to.")); _("There is no active layer or channel to stroke to."));
return; return;
} }
@ -436,7 +436,7 @@ vectors_stroke_last_vals_cmd_callback (GtkAction *action,
TRUE, NULL, &error)) TRUE, NULL, &error))
{ {
gimp_message_literal (image->gimp, G_OBJECT (widget), gimp_message_literal (image->gimp, G_OBJECT (widget),
GIMP_MESSAGE_WARNING, error->message); GIMP_MESSAGE_WARNING, error->message);
g_clear_error (&error); g_clear_error (&error);
} }
else else

2
app/core/gimp-templates.c
View File

@ -63,7 +63,7 @@ gimp_templates_load (Gimp *gimp)
filename, NULL, &error)) filename, NULL, &error))
{ {
gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR,
error->message); error->message);
} }
} }
else else

6
app/core/gimp.c
View File

@ -1285,9 +1285,9 @@ gimp_message_valist (Gimp *gimp,
void void
gimp_message_literal (Gimp *gimp, gimp_message_literal (Gimp *gimp,
GObject *handler, GObject *handler,
GimpMessageSeverity severity, GimpMessageSeverity severity,
const gchar *message) const gchar *message)
{ {
g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (handler == NULL || G_IS_OBJECT (handler)); g_return_if_fail (handler == NULL || G_IS_OBJECT (handler));

2
app/dialogs/convert-type-dialog.c
View File

@ -319,7 +319,7 @@ convert_dialog_response (GtkWidget *widget,
progress, &error)) progress, &error))
{ {
gimp_message_literal (dialog->image->gimp, G_OBJECT (dialog->dialog), gimp_message_literal (dialog->image->gimp, G_OBJECT (dialog->dialog),
GIMP_MESSAGE_WARNING, error->message); GIMP_MESSAGE_WARNING, error->message);
g_clear_error (&error); g_clear_error (&error);
if (progress) if (progress)

4
app/dialogs/palette-import-dialog.c
View File

@ -851,8 +851,8 @@ palette_import_make_palette (ImportDialog *dialog)
if (! palette) if (! palette)
{ {
gimp_message_literal (dialog->context->gimp, gimp_message_literal (dialog->context->gimp,
G_OBJECT (dialog->dialog), GIMP_MESSAGE_ERROR, G_OBJECT (dialog->dialog), GIMP_MESSAGE_ERROR,
error->message); error->message);
g_error_free (error); g_error_free (error);
} }
} }

6
app/dialogs/stroke-dialog.c
View File

@ -277,9 +277,9 @@ stroke_dialog_response (GtkWidget *widget,
if (! drawable) if (! drawable)
{ {
gimp_message_literal (context->gimp, G_OBJECT (widget), gimp_message_literal (context->gimp, G_OBJECT (widget),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
_("There is no active layer or channel " _("There is no active layer or channel "
"to stroke to.")); "to stroke to."));
return; return;
} }

4
app/display/gimpdisplayshell-dnd.c
View File

@ -323,8 +323,8 @@ gimp_display_shell_drop_svg (GtkWidget *widget,
NULL, &error)) NULL, &error))
{ {
gimp_message_literal (shell->display->gimp, G_OBJECT (shell->display), gimp_message_literal (shell->display->gimp, G_OBJECT (shell->display),
GIMP_MESSAGE_ERROR, GIMP_MESSAGE_ERROR,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
else else

4
app/file/file-open.c
View File

@ -756,13 +756,13 @@ file_open_profile_apply_rgb (GimpImage *image,
g_object_set (config, "mode", GIMP_COLOR_MANAGEMENT_OFF, NULL); g_object_set (config, "mode", GIMP_COLOR_MANAGEMENT_OFF, NULL);
gimp_message_literal (image->gimp, G_OBJECT (progress), gimp_message_literal (image->gimp, G_OBJECT (progress),
GIMP_MESSAGE_WARNING, msg); GIMP_MESSAGE_WARNING, msg);
g_free (msg); g_free (msg);
} }
else else
{ {
gimp_message_literal (image->gimp, G_OBJECT (progress), gimp_message_literal (image->gimp, G_OBJECT (progress),
GIMP_MESSAGE_ERROR, error->message); GIMP_MESSAGE_ERROR, error->message);
} }
g_error_free (error); g_error_free (error);

2
app/pdb/gimpprocedure.c
View File

@ -197,7 +197,7 @@ gimp_procedure_real_execute_async (GimpProcedure *procedure,
if (error) if (error)
{ {
gimp_message_literal (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR, gimp_message_literal (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
error->message); error->message);
g_error_free (error); g_error_free (error);
} }
} }

4
app/plug-in/gimpplugin-message.c
View File

@ -876,8 +876,8 @@ gimp_plug_in_handle_proc_install (GimpPlugIn *plug_in,
&error)) &error))
{ {
gimp_message_literal (plug_in->manager->gimp, gimp_message_literal (plug_in->manager->gimp,
NULL, GIMP_MESSAGE_WARNING, NULL, GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }

2
app/plug-in/gimpplugin.c
View File

@ -945,7 +945,7 @@ gimp_plug_in_menu_register (GimpPlugIn *plug_in,
if (! gimp_plug_in_procedure_add_menu_path (proc, menu_path, &error)) if (! gimp_plug_in_procedure_add_menu_path (proc, menu_path, &error))
{ {
gimp_message_literal (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR, gimp_message_literal (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
return FALSE; return FALSE;

8
app/plug-in/gimppluginmanager-restore.c
View File

@ -132,7 +132,7 @@ gimp_plug_in_manager_restore (GimpPlugInManager *manager,
if (! plug_in_rc_write (manager->plug_in_defs, pluginrc, &error)) if (! plug_in_rc_write (manager->plug_in_defs, pluginrc, &error))
{ {
gimp_message_literal (gimp, gimp_message_literal (gimp,
NULL, GIMP_MESSAGE_ERROR, error->message); NULL, GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error); g_clear_error (&error);
} }
@ -302,7 +302,7 @@ gimp_plug_in_manager_read_pluginrc (GimpPlugInManager *manager,
{ {
if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT) if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
gimp_message_literal (manager->gimp, NULL, GIMP_MESSAGE_ERROR, gimp_message_literal (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
@ -464,7 +464,7 @@ gimp_plug_in_manager_run_extensions (GimpPlugInManager *manager,
if (error) if (error)
{ {
gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }
@ -713,7 +713,7 @@ gimp_plug_in_manager_add_to_db (GimpPlugInManager *manager,
if (error) if (error)
{ {
gimp_message_literal (manager->gimp, NULL, GIMP_MESSAGE_ERROR, gimp_message_literal (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
error->message); error->message);
g_error_free (error); g_error_free (error);
} }
} }

4
app/text/gimptextlayer.c
View File

@ -625,8 +625,8 @@ gimp_text_layer_render (GimpTextLayer *layer)
if (gimp_container_is_empty (image->gimp->fonts)) if (gimp_container_is_empty (image->gimp->fonts))
{ {
gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR, gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR,
_("Due to lack of any fonts, " _("Due to lack of any fonts, "
"text functionality is not available.")); "text functionality is not available."));
return FALSE; return FALSE;
} }

2
app/tools/gimp-tools.c
View File

@ -389,7 +389,7 @@ gimp_tools_save (Gimp *gimp,
if (! gimp_contexts_save (gimp, &error)) if (! gimp_contexts_save (gimp, &error))
{ {
gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING, gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }

4
app/tools/gimpeditselectiontool.c
View File

@ -692,8 +692,8 @@ gimp_edit_selection_tool_update_motion (GimpEditSelectionTool *edit_select,
{ {
/* no region to float, abort safely */ /* no region to float, abort safely */
gimp_message_literal (display->gimp, G_OBJECT (display), gimp_message_literal (display->gimp, G_OBJECT (display),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
gimp_draw_tool_resume (draw_tool); gimp_draw_tool_resume (draw_tool);

8
app/tools/gimpimagemaptool-settings.c
View File

@ -172,8 +172,8 @@ gimp_image_map_tool_settings_import (GimpSettingsBox *box,
if (! tool_class->settings_import (tool, filename, &error)) if (! tool_class->settings_import (tool, filename, &error))
{ {
gimp_message_literal (GIMP_TOOL (tool)->tool_info->gimp, gimp_message_literal (GIMP_TOOL (tool)->tool_info->gimp,
G_OBJECT (gimp_tool_gui_get_dialog (tool->gui)), G_OBJECT (gimp_tool_gui_get_dialog (tool->gui)),
GIMP_MESSAGE_ERROR, error->message); GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error); g_clear_error (&error);
return FALSE; return FALSE;
@ -202,8 +202,8 @@ gimp_image_map_tool_settings_export (GimpSettingsBox *box,
if (! tool_class->settings_export (tool, filename, &error)) if (! tool_class->settings_export (tool, filename, &error))
{ {
gimp_message_literal (GIMP_TOOL (tool)->tool_info->gimp, gimp_message_literal (GIMP_TOOL (tool)->tool_info->gimp,
G_OBJECT (gimp_tool_gui_get_dialog (tool->gui)), G_OBJECT (gimp_tool_gui_get_dialog (tool->gui)),
GIMP_MESSAGE_ERROR, error->message); GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error); g_clear_error (&error);
return FALSE; return FALSE;

6
app/tools/gimptool.c
View File

@ -1266,15 +1266,15 @@ gimp_tool_message (GimpTool *tool,
void void
gimp_tool_message_literal (GimpTool *tool, gimp_tool_message_literal (GimpTool *tool,
GimpDisplay *display, GimpDisplay *display,
const gchar *message) const gchar *message)
{ {
g_return_if_fail (GIMP_IS_TOOL (tool)); g_return_if_fail (GIMP_IS_TOOL (tool));
g_return_if_fail (GIMP_IS_DISPLAY (display)); g_return_if_fail (GIMP_IS_DISPLAY (display));
g_return_if_fail (message != NULL); g_return_if_fail (message != NULL);
gimp_message_literal (display->gimp, G_OBJECT (display), gimp_message_literal (display->gimp, G_OBJECT (display),
GIMP_MESSAGE_WARNING, message); GIMP_MESSAGE_WARNING, message);
} }
void void

24
app/widgets/gimpactionview.c
View File

@ -629,8 +629,8 @@ gimp_action_view_conflict_response (GtkWidget *dialog,
TRUE)) TRUE))
{ {
gimp_message_literal (confirm_data->manager->gimp, G_OBJECT (dialog), gimp_message_literal (confirm_data->manager->gimp, G_OBJECT (dialog),
GIMP_MESSAGE_ERROR, GIMP_MESSAGE_ERROR,
_("Changing shortcut failed.")); _("Changing shortcut failed."));
} }
} }
@ -786,15 +786,15 @@ gimp_action_view_accel_edited (GtkCellRendererAccel *accel,
accel_key == GDK_KEY_KP_Space) accel_key == GDK_KEY_KP_Space)
{ {
gimp_message_literal (view->manager->gimp, gimp_message_literal (view->manager->gimp,
G_OBJECT (view), GIMP_MESSAGE_ERROR, G_OBJECT (view), GIMP_MESSAGE_ERROR,
_("Invalid shortcut.")); _("Invalid shortcut."));
} }
else if (accel_key == GDK_KEY_F1 || else if (accel_key == GDK_KEY_F1 ||
action_accel_key == GDK_KEY_F1) action_accel_key == GDK_KEY_F1)
{ {
gimp_message_literal (view->manager->gimp, gimp_message_literal (view->manager->gimp,
G_OBJECT (view), GIMP_MESSAGE_ERROR, G_OBJECT (view), GIMP_MESSAGE_ERROR,
_("F1 cannot be remapped.")); _("F1 cannot be remapped."));
} }
else if (! gtk_accel_map_change_entry (accel_path, else if (! gtk_accel_map_change_entry (accel_path,
accel_key, accel_mask, FALSE)) accel_key, accel_mask, FALSE))
@ -858,8 +858,8 @@ gimp_action_view_accel_edited (GtkCellRendererAccel *accel,
else else
{ {
gimp_message_literal (view->manager->gimp, gimp_message_literal (view->manager->gimp,
G_OBJECT (view), GIMP_MESSAGE_ERROR, G_OBJECT (view), GIMP_MESSAGE_ERROR,
_("Changing shortcut failed.")); _("Changing shortcut failed."));
} }
} }
} }
@ -886,15 +886,15 @@ gimp_action_view_accel_cleared (GtkCellRendererAccel *accel,
if (action_accel_key == GDK_KEY_F1) if (action_accel_key == GDK_KEY_F1)
{ {
gimp_message_literal (view->manager->gimp, gimp_message_literal (view->manager->gimp,
G_OBJECT (view), GIMP_MESSAGE_ERROR, G_OBJECT (view), GIMP_MESSAGE_ERROR,
_("F1 cannot be remapped.")); _("F1 cannot be remapped."));
return; return;
} }
if (! gtk_accel_map_change_entry (accel_path, 0, 0, FALSE)) if (! gtk_accel_map_change_entry (accel_path, 0, 0, FALSE))
{ {
gimp_message_literal (view->manager->gimp, gimp_message_literal (view->manager->gimp,
G_OBJECT (view), GIMP_MESSAGE_ERROR, G_OBJECT (view), GIMP_MESSAGE_ERROR,
_("Removing shortcut failed.")); _("Removing shortcut failed."));
} }
} }

30
app/widgets/gimpcontrollerlist.c
View File

@ -508,33 +508,33 @@ gimp_controller_list_add_clicked (GtkWidget *button,
gimp_controllers_get_keyboard (list->gimp) != NULL) gimp_controllers_get_keyboard (list->gimp) != NULL)
{ {
gimp_message_literal (list->gimp, gimp_message_literal (list->gimp,
G_OBJECT (button), GIMP_MESSAGE_WARNING, G_OBJECT (button), GIMP_MESSAGE_WARNING,
_("There can only be one active keyboard " _("There can only be one active keyboard "
"controller.\n\n" "controller.\n\n"
"You already have a keyboard controller in " "You already have a keyboard controller in "
"your list of active controllers.")); "your list of active controllers."));
return; return;
} }
else if (list->src_gtype == GIMP_TYPE_CONTROLLER_WHEEL && else if (list->src_gtype == GIMP_TYPE_CONTROLLER_WHEEL &&
gimp_controllers_get_wheel (list->gimp) != NULL) gimp_controllers_get_wheel (list->gimp) != NULL)
{ {
gimp_message_literal (list->gimp, gimp_message_literal (list->gimp,
G_OBJECT (button), GIMP_MESSAGE_WARNING, G_OBJECT (button), GIMP_MESSAGE_WARNING,
_("There can only be one active wheel " _("There can only be one active wheel "
"controller.\n\n" "controller.\n\n"
"You already have a wheel controller in " "You already have a wheel controller in "
"your list of active controllers.")); "your list of active controllers."));
return; return;
} }
else if (list->src_gtype == GIMP_TYPE_CONTROLLER_MOUSE && else if (list->src_gtype == GIMP_TYPE_CONTROLLER_MOUSE &&
gimp_controllers_get_mouse (list->gimp) != NULL) gimp_controllers_get_mouse (list->gimp) != NULL)
{ {
gimp_message_literal (list->gimp, gimp_message_literal (list->gimp,
G_OBJECT (button), GIMP_MESSAGE_WARNING, G_OBJECT (button), GIMP_MESSAGE_WARNING,
_("There can only be one active mouse " _("There can only be one active mouse "
"controller.\n\n" "controller.\n\n"
"You already have a mouse controller in " "You already have a mouse controller in "
"your list of active controllers.")); "your list of active controllers."));
return; return;
} }

2
app/widgets/gimpcontrollers.c
View File

@ -163,7 +163,7 @@ gimp_controllers_restore (Gimp *gimp,
filename, NULL, &error)) filename, NULL, &error))
{ {
gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR,
error->message); error->message);
} }
} }
else else

4
app/widgets/gimpdataeditor.c
View File

@ -640,8 +640,8 @@ gimp_data_editor_save_dirty (GimpDataEditor *editor)
{ {
gimp_message_literal (gimp_data_factory_get_gimp (editor->data_factory), gimp_message_literal (gimp_data_factory_get_gimp (editor->data_factory),
G_OBJECT (editor), G_OBJECT (editor),
GIMP_MESSAGE_ERROR, GIMP_MESSAGE_ERROR,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }

4
app/widgets/gimpdnd-xds.c
View File

@ -201,8 +201,8 @@ gimp_dnd_xds_save_image (GdkDragContext *context,
8, (const guchar *) "E", 1); 8, (const guchar *) "E", 1);
gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR, gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR,
_("The given filename does not have any known " _("The given filename does not have any known "
"file extension.")); "file extension."));
} }
g_free (uri); g_free (uri);

2
app/widgets/gimphelp.c
View File

@ -327,7 +327,7 @@ gimp_help_browser (Gimp *gimp,
if (error) if (error)
{ {
gimp_message_literal (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR, gimp_message_literal (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
error->message); error->message);
g_error_free (error); g_error_free (error);
} }
} }

4
app/widgets/gimpitemtreeview.c
View File

@ -1280,8 +1280,8 @@ gimp_item_tree_view_name_edited (GtkCellRendererText *cell,
if (error) if (error)
{ {
gimp_message_literal (view->priv->image->gimp, G_OBJECT (view), gimp_message_literal (view->priv->image->gimp, G_OBJECT (view),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }

4
app/widgets/gimppdbdialog.c
View File

@ -338,8 +338,8 @@ gimp_pdb_dialog_run_callback (GimpPdbDialog *dialog,
else if (error) else if (error)
{ {
gimp_message_literal (dialog->context->gimp, G_OBJECT (dialog), gimp_message_literal (dialog->context->gimp, G_OBJECT (dialog),
GIMP_MESSAGE_ERROR, GIMP_MESSAGE_ERROR,
error->message); error->message);
g_error_free (error); g_error_free (error);
} }

4
app/widgets/gimpsettingsbox.c
View File

@ -489,7 +489,7 @@ gimp_settings_box_deserialize (GimpSettingsBox *box)
{ {
if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT) if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
gimp_message_literal (private->gimp, NULL, GIMP_MESSAGE_ERROR, gimp_message_literal (private->gimp, NULL, GIMP_MESSAGE_ERROR,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
@ -515,7 +515,7 @@ gimp_settings_box_serialize (GimpSettingsBox *box)
NULL, &error)) NULL, &error))
{ {
gimp_message_literal (private->gimp, NULL, GIMP_MESSAGE_ERROR, gimp_message_literal (private->gimp, NULL, GIMP_MESSAGE_ERROR,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }

4
app/widgets/gimpthumbbox.c
View File

@ -700,8 +700,8 @@ gimp_thumb_box_create_thumbnail (GimpThumbBox *box,
size, ! force, &error)) size, ! force, &error))
{ {
gimp_message_literal (box->context->gimp, gimp_message_literal (box->context->gimp,
G_OBJECT (progress), GIMP_MESSAGE_ERROR, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }

4
app/widgets/gimpvectorstreeview.c
View File

@ -236,8 +236,8 @@ gimp_vectors_tree_view_drop_svg (GimpContainerTreeView *tree_view,
TRUE, FALSE, parent, index, NULL, &error)) TRUE, FALSE, parent, index, NULL, &error))
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (tree_view), GIMP_MESSAGE_ERROR, G_OBJECT (tree_view), GIMP_MESSAGE_ERROR,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }
else else

48
app/xcf/xcf-load.c
View File

@ -366,8 +366,8 @@ xcf_load_image (Gimp *gimp,
goto hard_error; goto hard_error;
gimp_message_literal (gimp, G_OBJECT (info->progress), GIMP_MESSAGE_WARNING, gimp_message_literal (gimp, G_OBJECT (info->progress), GIMP_MESSAGE_WARNING,
_("This XCF file is corrupt! I have loaded as much " _("This XCF file is corrupt! I have loaded as much "
"of it as I can, but it is incomplete.")); "of it as I can, but it is incomplete."));
xcf_load_add_masks (image); xcf_load_add_masks (image);
@ -377,8 +377,8 @@ xcf_load_image (Gimp *gimp,
hard_error: hard_error:
g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("This XCF file is corrupt! I could not even " _("This XCF file is corrupt! I could not even "
"salvage any partial image data from it.")); "salvage any partial image data from it."));
if (image) if (image)
g_object_unref (image); g_object_unref (image);
@ -459,7 +459,7 @@ xcf_load_image_props (XcfInfo *info,
gimp_message (info->gimp, G_OBJECT (info->progress), gimp_message (info->gimp, G_OBJECT (info->progress),
GIMP_MESSAGE_ERROR, GIMP_MESSAGE_ERROR,
"Maximum colormap size (%d) exceeded", "Maximum colormap size (%d) exceeded",
GIMP_IMAGE_COLORMAP_SIZE); GIMP_IMAGE_COLORMAP_SIZE);
return FALSE; return FALSE;
} }
@ -468,10 +468,10 @@ xcf_load_image_props (XcfInfo *info,
gint i; gint i;
gimp_message_literal (info->gimp, G_OBJECT (info->progress), gimp_message_literal (info->gimp, G_OBJECT (info->progress),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
_("XCF warning: version 0 of XCF file format\n" _("XCF warning: version 0 of XCF file format\n"
"did not save indexed colormaps correctly.\n" "did not save indexed colormaps correctly.\n"
"Substituting grayscale map.")); "Substituting grayscale map."));
if (! xcf_seek_pos (info, info->cp + n_colors, NULL)) if (! xcf_seek_pos (info, info->cp + n_colors, NULL))
return FALSE; return FALSE;
@ -550,8 +550,8 @@ xcf_load_image_props (XcfInfo *info,
default: default:
gimp_message_literal (info->gimp, G_OBJECT (info->progress), gimp_message_literal (info->gimp, G_OBJECT (info->progress),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
"Guide orientation out of range in XCF file"); "Guide orientation out of range in XCF file");
continue; continue;
} }
} }
@ -593,8 +593,8 @@ xcf_load_image_props (XcfInfo *info,
GimpTemplate *template = image->gimp->config->default_image; GimpTemplate *template = image->gimp->config->default_image;
gimp_message_literal (info->gimp, G_OBJECT (info->progress), gimp_message_literal (info->gimp, G_OBJECT (info->progress),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
"Warning, resolution out of range in XCF file"); "Warning, resolution out of range in XCF file");
xres = gimp_template_get_resolution_x (template); xres = gimp_template_get_resolution_x (template);
yres = gimp_template_get_resolution_y (template); yres = gimp_template_get_resolution_y (template);
} }
@ -626,8 +626,8 @@ xcf_load_image_props (XcfInfo *info,
if (info->cp - base != prop_size) if (info->cp - base != prop_size)
gimp_message_literal (info->gimp, G_OBJECT (info->progress), gimp_message_literal (info->gimp, G_OBJECT (info->progress),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
"Error while loading an image's parasites"); "Error while loading an image's parasites");
} }
break; break;
@ -641,9 +641,9 @@ xcf_load_image_props (XcfInfo *info,
(unit >= gimp_unit_get_number_of_built_in_units ())) (unit >= gimp_unit_get_number_of_built_in_units ()))
{ {
gimp_message_literal (info->gimp, G_OBJECT (info->progress), gimp_message_literal (info->gimp, G_OBJECT (info->progress),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
"Warning, unit out of range in XCF file, " "Warning, unit out of range in XCF file, "
"falling back to inches"); "falling back to inches");
unit = GIMP_UNIT_INCH; unit = GIMP_UNIT_INCH;
} }
@ -899,8 +899,8 @@ xcf_load_layer_props (XcfInfo *info,
if (info->cp - base != prop_size) if (info->cp - base != prop_size)
gimp_message_literal (info->gimp, G_OBJECT (info->progress), gimp_message_literal (info->gimp, G_OBJECT (info->progress),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
"Error while loading a layer's parasites"); "Error while loading a layer's parasites");
} }
break; break;
@ -1095,8 +1095,8 @@ xcf_load_channel_props (XcfInfo *info,
if (info->cp - base != prop_size) if (info->cp - base != prop_size)
gimp_message_literal (info->gimp, G_OBJECT (info->progress), gimp_message_literal (info->gimp, G_OBJECT (info->progress),
GIMP_MESSAGE_WARNING, GIMP_MESSAGE_WARNING,
"Error while loading a channel's parasites"); "Error while loading a channel's parasites");
} }
break; break;
@ -1533,8 +1533,8 @@ xcf_load_level (XcfInfo *info,
if (offset == 0) if (offset == 0)
{ {
gimp_message_literal (info->gimp, G_OBJECT (info->progress), gimp_message_literal (info->gimp, G_OBJECT (info->progress),
GIMP_MESSAGE_ERROR, GIMP_MESSAGE_ERROR,
"not enough tiles found in level"); "not enough tiles found in level");
return FALSE; return FALSE;
} }