dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/config/gimpconfig-deserialize.c app/config/gimpscanner.c 

2004-05-12  Michael Natterer  <mitch@gimp.org>

	* app/config/gimpconfig-deserialize.c
	* app/config/gimpscanner.c
	* app/core/gimp-edit.c
	* app/core/gimpchannel-combine.c
	* app/core/gimpcontainer.c
	* app/core/gimpdrawable-bucket-fill.c
	* app/core/gimpdrawable-combine.c
	* app/core/gimpdrawable.c
	* app/core/gimpgradient.c
	* app/core/gimpimage-flip.c
	* app/core/gimpimage-merge.c
	* app/core/gimpimage-projection.c
	* app/core/gimpimage.c
	* app/display/gimpdisplay-handlers.c
	* app/display/gimpdisplayshell-callbacks.c
	* app/display/gimpprogress.c
	* app/gui/info-dialog.c
	* app/gui/module-browser.c
	* app/gui/offset-dialog.c
	* app/plug-in/plug-in.c
	* app/tools/gimpdrawtool.c
	* app/tools/tool_manager.c
	* app/widgets/gimpactiongroup.c
	* app/widgets/gimpdialogfactory.c
	* app/widgets/gimpgradienteditor.c
	* app/widgets/gimpitemfactory.c
	* app/widgets/gimppropwidgets.c
	* app/widgets/gimpwidgets-utils.c
	* app/xcf/xcf-save.c
	* libgimp/gimpexport.c
	* libgimpwidgets/gimphelpui.c
	* libgimpwidgets/gimppixmap.c
	* libgimpwidgets/gimpunitmenu.c: replaced G_GNUC_FUNCTION,
	G_GNUC_PRETTY_FUNCTION, G_STRLOC and hardcoded function names in
	g_warning()s by G_STRFUNC.
This commit is contained in:
Michael Natterer 2004-05-12 08:13:33 +00:00 committed by Michael Natterer
parent e6342de9fa
commit de7a940501
42 changed files with 242 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ChangeLog
View File

@ -1,3 +1,41 @@
2004-05-12 Michael Natterer <mitch@gimp.org>
* app/config/gimpconfig-deserialize.c
* app/config/gimpscanner.c
* app/core/gimp-edit.c
* app/core/gimpchannel-combine.c
* app/core/gimpcontainer.c
* app/core/gimpdrawable-bucket-fill.c
* app/core/gimpdrawable-combine.c
* app/core/gimpdrawable.c
* app/core/gimpgradient.c
* app/core/gimpimage-flip.c
* app/core/gimpimage-merge.c
* app/core/gimpimage-projection.c
* app/core/gimpimage.c
* app/display/gimpdisplay-handlers.c
* app/display/gimpdisplayshell-callbacks.c
* app/display/gimpprogress.c
* app/gui/info-dialog.c
* app/gui/module-browser.c
* app/gui/offset-dialog.c
* app/plug-in/plug-in.c
* app/tools/gimpdrawtool.c
* app/tools/tool_manager.c
* app/widgets/gimpactiongroup.c
* app/widgets/gimpdialogfactory.c
* app/widgets/gimpgradienteditor.c
* app/widgets/gimpitemfactory.c
* app/widgets/gimppropwidgets.c
* app/widgets/gimpwidgets-utils.c
* app/xcf/xcf-save.c
* libgimp/gimpexport.c
* libgimpwidgets/gimphelpui.c
* libgimpwidgets/gimppixmap.c
* libgimpwidgets/gimpunitmenu.c: replaced G_GNUC_FUNCTION,
G_GNUC_PRETTY_FUNCTION, G_STRLOC and hardcoded function names in
g_warning()s by G_STRFUNC.
2004-05-12 Michael Natterer <mitch@gimp.org> 2004-05-12 Michael Natterer <mitch@gimp.org>
* app/actions/gradients-actions.c * app/actions/gradients-actions.c

5
app/config/gimpconfig-deserialize.c
View File

@ -314,7 +314,8 @@ gimp_config_deserialize_property (GimpConfig *config,
#ifdef CONFIG_DEBUG #ifdef CONFIG_DEBUG
else else
{ {
g_warning ("couldn't deserialize property %s::%s of type %s", g_warning ("%s: couldn't deserialize property %s::%s of type %s",
G_STRFUNC,
g_type_name (G_TYPE_FROM_INSTANCE (config)), g_type_name (G_TYPE_FROM_INSTANCE (config)),
prop_spec->name, prop_spec->name,
g_type_name (prop_spec->value_type)); g_type_name (prop_spec->value_type));
@ -731,7 +732,7 @@ gimp_config_deserialize_any (GValue *value,
if (!g_value_type_transformable (G_TYPE_STRING, prop_spec->value_type)) if (!g_value_type_transformable (G_TYPE_STRING, prop_spec->value_type))
{ {
g_warning ("%s: %s can not be transformed from a string", g_warning ("%s: %s can not be transformed from a string",
G_STRLOC, g_type_name (prop_spec->value_type)); G_STRFUNC, g_type_name (prop_spec->value_type));
return G_TOKEN_NONE; return G_TOKEN_NONE;
} }

2
app/config/gimpscanner.c
View File

@ -167,7 +167,7 @@ gimp_scanner_destroy (GScanner *scanner)
{ {
if (close (data->fd)) if (close (data->fd))
g_warning ("%s: could not close file descriptor: %s", g_warning ("%s: could not close file descriptor: %s",
G_GNUC_PRETTY_FUNCTION, g_strerror (errno)); G_STRFUNC, g_strerror (errno));
} }
g_free (data->name); g_free (data->name);

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

@ -300,7 +300,7 @@ gimp_edit_fill (GimpImage *gimage,
return TRUE; /* nothing to do, but the fill succeded */ return TRUE; /* nothing to do, but the fill succeded */
default: default:
g_warning ("%s: unknown fill type", G_GNUC_PRETTY_FUNCTION); g_warning ("%s: unknown fill type", G_STRFUNC);
fill_type = GIMP_BACKGROUND_FILL; fill_type = GIMP_BACKGROUND_FILL;
undo_desc = _("Fill with BG Color"); undo_desc = _("Fill with BG Color");
break; break;

2
app/core/gimpchannel-combine.c
View File

@ -489,7 +489,7 @@ gimp_channel_combine_mask (GimpChannel *mask,
break; break;
default: default:
g_warning ("%s: unknown operation type\n", G_GNUC_PRETTY_FUNCTION); g_warning ("%s: unknown operation type", G_STRFUNC);
break; break;
} }

22
app/core/gimpcontainer.c
View File

@ -564,8 +564,8 @@ gimp_container_add (GimpContainer *container,
if (gimp_container_have (container, object)) if (gimp_container_have (container, object))
{ {
g_warning ("%s(): container %p already contains object %p", g_warning ("%s: container %p already contains object %p",
G_GNUC_FUNCTION, container, object); G_STRFUNC, container, object);
return FALSE; return FALSE;
} }
@ -618,8 +618,8 @@ gimp_container_remove (GimpContainer *container,
if (! gimp_container_have (container, object)) if (! gimp_container_have (container, object))
{ {
g_warning ("%s(): container %p does not contain object %p", g_warning ("%s: container %p does not contain object %p",
G_GNUC_FUNCTION, container, object); G_STRFUNC, container, object);
return FALSE; return FALSE;
} }
@ -675,8 +675,8 @@ gimp_container_insert (GimpContainer *container,
if (gimp_container_have (container, object)) if (gimp_container_have (container, object))
{ {
g_warning ("%s(): container %p already contains object %p", g_warning ("%s: container %p already contains object %p",
G_GNUC_FUNCTION, container, object); G_STRFUNC, container, object);
return FALSE; return FALSE;
} }
@ -704,8 +704,8 @@ gimp_container_reorder (GimpContainer *container,
if (! gimp_container_have (container, object)) if (! gimp_container_have (container, object))
{ {
g_warning ("%s(): container %p does not contain object %p", g_warning ("%s: container %p does not contain object %p",
G_GNUC_FUNCTION, container, object); G_STRFUNC, container, object);
return FALSE; return FALSE;
} }
@ -900,7 +900,7 @@ gimp_container_add_handler (GimpContainer *container,
handler->callback_data = callback_data; handler->callback_data = callback_data;
handler->quark = g_quark_from_string (key); handler->quark = g_quark_from_string (key);
D (g_print ("%s: key = %s, id = %d\n", G_GNUC_FUNCTION, key, handler->quark)); D (g_print ("%s: key = %s, id = %d\n", G_STRFUNC, key, handler->quark));
g_free (key); g_free (key);
@ -951,11 +951,11 @@ gimp_container_remove_handler (GimpContainer *container,
if (! list) if (! list)
{ {
g_warning ("%s: tried to remove handler which unknown id %d", g_warning ("%s: tried to remove handler which unknown id %d",
G_STRLOC, id); G_STRFUNC, id);
return; return;
} }
D (g_print ("%s: id = %d\n", G_GNUC_FUNCTION, handler->quark)); D (g_print ("%s: id = %d\n", G_STRFUNC, handler->quark));
gimp_container_foreach (container, gimp_container_foreach (container,
(GFunc) gimp_container_remove_handler_foreach_func, (GFunc) gimp_container_remove_handler_foreach_func,

4
app/core/gimpdrawable-bucket-fill.c
View File

@ -89,7 +89,7 @@ gimp_drawable_bucket_fill (GimpDrawable *drawable,
} }
else else
{ {
g_warning ("%s: invalid fill_mode passed", G_GNUC_PRETTY_FUNCTION); g_warning ("%s: invalid fill_mode passed", G_STRFUNC);
return; return;
} }
@ -158,7 +158,7 @@ gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
} }
else else
{ {
g_warning ("%s: invalid fill_mode passed", G_GNUC_PRETTY_FUNCTION); g_warning ("%s: invalid fill_mode passed", G_STRFUNC);
return; return;
} }

4
app/core/gimpdrawable-combine.c
View File

@ -71,7 +71,7 @@ gimp_drawable_real_apply_region (GimpDrawable *drawable,
src2PR->bytes); src2PR->bytes);
if (operation == -1) if (operation == -1)
{ {
g_warning ("%s: illegal parameters.", G_GNUC_PRETTY_FUNCTION); g_warning ("%s: illegal parameters.", G_STRFUNC);
return; return;
} }
@ -193,7 +193,7 @@ gimp_drawable_real_replace_region (GimpDrawable *drawable,
src2PR->bytes); src2PR->bytes);
if (operation == -1) if (operation == -1)
{ {
g_warning ("%s: illegal parameters.", G_GNUC_PRETTY_FUNCTION); g_warning ("%s: illegal parameters.", G_STRFUNC);
return; return;
} }

4
app/core/gimpdrawable.c
View File

@ -982,7 +982,7 @@ gimp_drawable_push_undo (GimpDrawable *drawable,
gimp_item_height (item), gimp_item_height (item),
&x, &y, &width, &height)) &x, &y, &width, &height))
{ {
g_warning ("gimp_drawable_push_undo: tried to push empty region"); g_warning ("%s: tried to push empty region", G_STRFUNC);
return; return;
} }
@ -1138,7 +1138,7 @@ gimp_drawable_fill_by_type (GimpDrawable *drawable,
return; return;
default: default:
g_warning ("%s: unknown fill type %d", G_GNUC_PRETTY_FUNCTION, fill_type); g_warning ("%s: unknown fill type %d", G_STRFUNC, fill_type);
return; return;
} }

10
app/core/gimpgradient.c
View File

@ -709,7 +709,7 @@ gimp_gradient_get_color_at (GimpGradient *gradient,
default: default:
g_warning ("%s: Unknown gradient type %d.", g_warning ("%s: Unknown gradient type %d.",
G_GNUC_PRETTY_FUNCTION, seg->type); G_STRFUNC, seg->type);
break; break;
} }
@ -768,8 +768,8 @@ gimp_gradient_get_color_at (GimpGradient *gradient,
break; break;
default: default:
g_warning ("%s(): Unknown coloring mode %d", g_warning ("%s: Unknown coloring mode %d",
G_GNUC_PRETTY_FUNCTION, (gint) seg->color); G_STRFUNC, (gint) seg->color);
break; break;
} }
@ -821,8 +821,8 @@ gimp_gradient_get_segment_at (GimpGradient *gradient,
} }
/* Oops: we should have found a segment, but we didn't */ /* Oops: we should have found a segment, but we didn't */
g_warning ("%s(): no matching segment for position %0.15f", g_warning ("%s: no matching segment for position %0.15f",
G_GNUC_PRETTY_FUNCTION, pos); G_STRFUNC, pos);
return NULL; return NULL;
} }

2
app/core/gimpimage-flip.c
View File

@ -62,7 +62,7 @@ gimp_image_flip (GimpImage *gimage,
break; break;
default: default:
g_warning ("gimp_image_flip(): unknown flip_type"); g_warning ("%s: unknown flip_type", G_STRFUNC);
return; return;
} }

9
app/core/gimpimage-merge.c
View File

@ -325,8 +325,7 @@ gimp_image_merge_layers (GimpImage *gimage,
GIMP_OPACITY_OPAQUE, GIMP_NORMAL_MODE); GIMP_OPACITY_OPAQUE, GIMP_NORMAL_MODE);
if (!merge_layer) if (!merge_layer)
{ {
g_warning ("%s: could not allocate merge layer.", g_warning ("%s: could not allocate merge layer.", G_STRFUNC);
G_GNUC_PRETTY_FUNCTION);
return NULL; return NULL;
} }
@ -365,8 +364,7 @@ gimp_image_merge_layers (GimpImage *gimage,
if (!merge_layer) if (!merge_layer)
{ {
g_warning ("%s: could not allocate merge layer", g_warning ("%s: could not allocate merge layer", G_STRFUNC);
G_GNUC_PRETTY_FUNCTION);
return NULL; return NULL;
} }
@ -417,8 +415,7 @@ gimp_image_merge_layers (GimpImage *gimage,
if (operation == -1) if (operation == -1)
{ {
g_warning ("%s: attempting to merge incompatible layers.", g_warning ("%s: attempting to merge incompatible layers.", G_STRFUNC);
G_GNUC_PRETTY_FUNCTION);
return NULL; return NULL;
} }

2
app/core/gimpimage-projection.c
View File

@ -726,7 +726,7 @@ project_indexed (GimpImage *gimage,
gimage->visible, gimage->visible,
INITIAL_INDEXED); INITIAL_INDEXED);
else else
g_warning ("%s: unable to project indexed image.", G_GNUC_PRETTY_FUNCTION); g_warning ("%s: unable to project indexed image.", G_STRFUNC);
} }
static void static void

24
app/core/gimpimage.c
View File

@ -2097,8 +2097,7 @@ gimp_image_get_new_tattoo (GimpImage *gimage)
gimage->tattoo_state++; gimage->tattoo_state++;
if (gimage->tattoo_state <= 0) if (gimage->tattoo_state <= 0)
g_warning ("%s: Tattoo state corrupted (integer overflow).", g_warning ("%s: Tattoo state corrupted (integer overflow).", G_STRFUNC);
G_GNUC_PRETTY_FUNCTION);
return gimage->tattoo_state; return gimage->tattoo_state;
} }
@ -2526,15 +2525,13 @@ gimp_image_add_layer (GimpImage *gimage,
if (GIMP_ITEM (layer)->gimage != NULL && if (GIMP_ITEM (layer)->gimage != NULL &&
GIMP_ITEM (layer)->gimage != gimage) GIMP_ITEM (layer)->gimage != gimage)
{ {
g_warning ("%s: attempting to add layer to wrong image.", g_warning ("%s: attempting to add layer to wrong image.", G_STRFUNC);
G_GNUC_PRETTY_FUNCTION);
return FALSE; return FALSE;
} }
if (gimp_container_have (gimage->layers, GIMP_OBJECT (layer))) if (gimp_container_have (gimage->layers, GIMP_OBJECT (layer)))
{ {
g_warning ("%s: trying to add layer to image twice.", g_warning ("%s: trying to add layer to image twice.", G_STRFUNC);
G_GNUC_PRETTY_FUNCTION);
return FALSE; return FALSE;
} }
@ -2543,8 +2540,7 @@ gimp_image_add_layer (GimpImage *gimage,
if (floating_sel && gimp_layer_is_floating_sel (layer)) if (floating_sel && gimp_layer_is_floating_sel (layer))
{ {
g_warning ("%s: trying to add floating layer to image which alyready " g_warning ("%s: trying to add floating layer to image which alyready "
"has a floating selection.", "has a floating selection.", G_STRFUNC);
G_GNUC_PRETTY_FUNCTION);
return FALSE; return FALSE;
} }
@ -2855,15 +2851,13 @@ gimp_image_add_channel (GimpImage *gimage,
if (GIMP_ITEM (channel)->gimage != NULL && if (GIMP_ITEM (channel)->gimage != NULL &&
GIMP_ITEM (channel)->gimage != gimage) GIMP_ITEM (channel)->gimage != gimage)
{ {
g_warning ("%s: attempting to add channel to wrong image.", g_warning ("%s: attempting to add channel to wrong image.", G_STRFUNC);
G_GNUC_PRETTY_FUNCTION);
return FALSE; return FALSE;
} }
if (gimp_container_have (gimage->channels, GIMP_OBJECT (channel))) if (gimp_container_have (gimage->channels, GIMP_OBJECT (channel)))
{ {
g_warning ("%s: trying to add channel to image twice.", g_warning ("%s: trying to add channel to image twice.", G_STRFUNC);
G_GNUC_PRETTY_FUNCTION);
return FALSE; return FALSE;
} }
@ -3095,15 +3089,13 @@ gimp_image_add_vectors (GimpImage *gimage,
if (GIMP_ITEM (vectors)->gimage != NULL && if (GIMP_ITEM (vectors)->gimage != NULL &&
GIMP_ITEM (vectors)->gimage != gimage) GIMP_ITEM (vectors)->gimage != gimage)
{ {
g_warning ("%s: attempting to add vectors to wrong image.", g_warning ("%s: attempting to add vectors to wrong image.", G_STRFUNC);
G_GNUC_PRETTY_FUNCTION);
return FALSE; return FALSE;
} }
if (gimp_container_have (gimage->vectors, GIMP_OBJECT (vectors))) if (gimp_container_have (gimage->vectors, GIMP_OBJECT (vectors)))
{ {
g_warning ("%s: trying to add vectors to image twice.", g_warning ("%s: trying to add vectors to image twice.", G_STRFUNC);
G_GNUC_PRETTY_FUNCTION);
return FALSE; return FALSE;
} }

2
app/core/gimpprojection-construct.c
View File

@ -726,7 +726,7 @@ project_indexed (GimpImage *gimage,
gimage->visible, gimage->visible,
INITIAL_INDEXED); INITIAL_INDEXED);
else else
g_warning ("%s: unable to project indexed image.", G_GNUC_PRETTY_FUNCTION); g_warning ("%s: unable to project indexed image.", G_STRFUNC);
} }
static void static void

2
app/dialogs/info-dialog.c
View File

@ -475,7 +475,7 @@ info_dialog_update_field (InfoField *field)
break; break;
default: default:
g_warning ("%s: Unknown info_dialog field type.", G_STRLOC); g_warning ("%s: Unknown info_dialog field type.", G_STRFUNC);
break; break;
} }

4
app/dialogs/module-dialog.c
View File

@ -296,7 +296,7 @@ browser_autoload_toggled (GtkCellRendererToggle *celltoggle,
path = gtk_tree_path_new_from_string (path_string); path = gtk_tree_path_new_from_string (path_string);
if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (browser->list), &iter, path)) if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (browser->list), &iter, path))
{ {
g_warning ("%s: bad tree path?", G_STRLOC); g_warning ("%s: bad tree path?", G_STRFUNC);
return; return;
} }
gtk_tree_path_free (path); gtk_tree_path_free (path);
@ -393,7 +393,7 @@ browser_info_remove (GimpModuleDB *db,
while (gtk_tree_model_iter_next (GTK_TREE_MODEL (browser->list), &iter)); while (gtk_tree_model_iter_next (GTK_TREE_MODEL (browser->list), &iter));
g_warning ("%s: Tried to remove a module not in the browser's list.", g_warning ("%s: Tried to remove a module not in the browser's list.",
G_STRLOC); G_STRFUNC);
} }
static void static void

2
app/dialogs/offset-dialog.c
View File

@ -101,7 +101,7 @@ offset_dialog_new (GimpDrawable *drawable,
else if (GIMP_IS_CHANNEL (drawable)) else if (GIMP_IS_CHANNEL (drawable))
title = _("Offset Channel"); title = _("Offset Channel");
else else
g_warning ("%s: unexpected drawable type", G_STRLOC); g_warning ("%s: unexpected drawable type", G_STRFUNC);
off_d->dlg = gimp_viewable_dialog_new (GIMP_VIEWABLE (drawable), off_d->dlg = gimp_viewable_dialog_new (GIMP_VIEWABLE (drawable),
_("Offset"), "gimp-drawable-offset", _("Offset"), "gimp-drawable-offset",

4
app/display/gimpdisplay-handlers.c
View File

@ -63,7 +63,7 @@ gimp_display_connect (GimpDisplay *gdisp,
#if 0 #if 0
g_print ("%s: gimage->ref_count before refing: %d\n", g_print ("%s: gimage->ref_count before refing: %d\n",
G_GNUC_FUNCTION, G_OBJECT (gdisp->gimage)->ref_count); G_STRFUNC, G_OBJECT (gdisp->gimage)->ref_count);
#endif #endif
g_object_ref (gimage); g_object_ref (gimage);
@ -101,7 +101,7 @@ gimp_display_disconnect (GimpDisplay *gdisp)
#if 0 #if 0
g_print ("%s: gimage->ref_count before unrefing: %d\n", g_print ("%s: gimage->ref_count before unrefing: %d\n",
G_GNUC_FUNCTION, G_OBJECT (gdisp->gimage)->ref_count); G_STRFUNC, G_OBJECT (gdisp->gimage)->ref_count);
#endif #endif
/* set gdisp->gimage to NULL before unrefing because there may be code /* set gdisp->gimage to NULL before unrefing because there may be code

8
app/display/gimpdisplayshell-callbacks.c
View File

@ -453,7 +453,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
if (! canvas->window) if (! canvas->window)
{ {
g_warning ("%s: called unrealized", G_STRLOC); g_warning ("%s: called unrealized", G_STRFUNC);
return FALSE; return FALSE;
} }
@ -791,7 +791,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
if (shell->space_release_pending) if (shell->space_release_pending)
{ {
#ifdef DEBUG_MOVE_PUSH #ifdef DEBUG_MOVE_PUSH
g_printerr ("%s: popping move tool\n", G_GNUC_FUNCTION); g_printerr ("%s: popping move tool\n", G_STRFUNC);
#endif #endif
gimp_context_set_tool (gimp_get_user_context (gimp), gimp_context_set_tool (gimp_get_user_context (gimp),
@ -1103,7 +1103,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
if (GIMP_IS_TOOL_INFO (move_tool_info)) if (GIMP_IS_TOOL_INFO (move_tool_info))
{ {
#ifdef DEBUG_MOVE_PUSH #ifdef DEBUG_MOVE_PUSH
g_printerr ("%s: pushing move tool\n", G_GNUC_FUNCTION); g_printerr ("%s: pushing move tool\n", G_STRFUNC);
#endif #endif
space_shaded_tool = active_tool->tool_info; space_shaded_tool = active_tool->tool_info;
@ -1190,7 +1190,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
if (shell->space_pressed) if (shell->space_pressed)
{ {
#ifdef DEBUG_MOVE_PUSH #ifdef DEBUG_MOVE_PUSH
g_printerr ("%s: popping move tool\n", G_GNUC_FUNCTION); g_printerr ("%s: popping move tool\n", G_STRFUNC);
#endif #endif
gimp_context_set_tool (gimp_get_user_context (gimp), gimp_context_set_tool (gimp_get_user_context (gimp),

5
app/display/gimpprogress.c
View File

@ -119,9 +119,8 @@ gimp_progress_start (GimpDisplay *gdisp,
*/ */
if (GIMP_STATUSBAR (shell->statusbar)->progressid) if (GIMP_STATUSBAR (shell->statusbar)->progressid)
{ {
g_warning ("gimp_progress_start(): " g_warning ("%s: %d progress bars already active for display %p",
"%d progress bars already active for display %p", G_STRFUNC, GIMP_STATUSBAR (shell->statusbar)->progressid,
GIMP_STATUSBAR (shell->statusbar)->progressid,
gdisp); gdisp);
} }

2
app/gui/info-dialog.c
View File

@ -475,7 +475,7 @@ info_dialog_update_field (InfoField *field)
break; break;
default: default:
g_warning ("%s: Unknown info_dialog field type.", G_STRLOC); g_warning ("%s: Unknown info_dialog field type.", G_STRFUNC);
break; break;
} }

4
app/gui/module-browser.c
View File

@ -296,7 +296,7 @@ browser_autoload_toggled (GtkCellRendererToggle *celltoggle,
path = gtk_tree_path_new_from_string (path_string); path = gtk_tree_path_new_from_string (path_string);
if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (browser->list), &iter, path)) if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (browser->list), &iter, path))
{ {
g_warning ("%s: bad tree path?", G_STRLOC); g_warning ("%s: bad tree path?", G_STRFUNC);
return; return;
} }
gtk_tree_path_free (path); gtk_tree_path_free (path);
@ -393,7 +393,7 @@ browser_info_remove (GimpModuleDB *db,
while (gtk_tree_model_iter_next (GTK_TREE_MODEL (browser->list), &iter)); while (gtk_tree_model_iter_next (GTK_TREE_MODEL (browser->list), &iter));
g_warning ("%s: Tried to remove a module not in the browser's list.", g_warning ("%s: Tried to remove a module not in the browser's list.",
G_STRLOC); G_STRFUNC);
} }
static void static void

2
app/gui/offset-dialog.c
View File

@ -101,7 +101,7 @@ offset_dialog_new (GimpDrawable *drawable,
else if (GIMP_IS_CHANNEL (drawable)) else if (GIMP_IS_CHANNEL (drawable))
title = _("Offset Channel"); title = _("Offset Channel");
else else
g_warning ("%s: unexpected drawable type", G_STRLOC); g_warning ("%s: unexpected drawable type", G_STRFUNC);
off_d->dlg = gimp_viewable_dialog_new (GIMP_VIEWABLE (drawable), off_d->dlg = gimp_viewable_dialog_new (GIMP_VIEWABLE (drawable),
_("Offset"), "gimp-drawable-offset", _("Offset"), "gimp-drawable-offset",

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

@ -874,7 +874,7 @@ plug_in_main_loop_quit (PlugIn *plug_in)
if (! plug_in->temp_main_loops) if (! plug_in->temp_main_loops)
{ {
g_warning ("plug_in_main_loop_quit: called without a temp main loop running"); g_warning ("%s: called without a temp main loop running", G_STRFUNC);
return; return;
} }

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

@ -874,7 +874,7 @@ plug_in_main_loop_quit (PlugIn *plug_in)
if (! plug_in->temp_main_loops) if (! plug_in->temp_main_loops)
{ {
g_warning ("plug_in_main_loop_quit: called without a temp main loop running"); g_warning ("%s: called without a temp main loop running", G_STRFUNC);
return; return;
} }

7
app/tools/gimpdrawtool.c
View File

@ -296,8 +296,7 @@ gimp_draw_tool_resume (GimpDrawTool *draw_tool)
} }
else else
{ {
g_warning ("gimp_draw_tool_resume(): " g_warning ("%s: called with draw_tool->paused_count == 0", G_STRFUNC);
"called with draw_tool->paused_count == 0");
} }
} }
@ -742,7 +741,7 @@ gimp_draw_tool_draw_handle (GimpDrawTool *draw_tool,
break; break;
default: default:
g_warning ("%s: invalid handle type %d", G_GNUC_PRETTY_FUNCTION, type); g_warning ("%s: invalid handle type %d", G_STRFUNC, type);
break; break;
} }
} }
@ -807,7 +806,7 @@ gimp_draw_tool_on_handle (GimpDrawTool *draw_tool,
return ((SQR (handle_tx - tx) + SQR (handle_ty - ty)) < SQR (width)); return ((SQR (handle_tx - tx) + SQR (handle_ty - ty)) < SQR (width));
default: default:
g_warning ("%s: invalid handle type %d", G_GNUC_PRETTY_FUNCTION, type); g_warning ("%s: invalid handle type %d", G_STRFUNC, type);
break; break;
} }

4
app/tools/tool_manager.c
View File

@ -495,8 +495,8 @@ tool_manager_tool_changed (GimpContext *user_context,
} }
else else
{ {
g_warning ("%s(): tool_info->tool_type is no GimpTool subclass", g_warning ("%s: tool_info->tool_type is no GimpTool subclass",
G_GNUC_FUNCTION); G_STRFUNC);
return; return;
} }

16
app/widgets/gimpactiongroup.c
View File

@ -574,7 +574,7 @@ gimp_action_group_set_action_visible (GimpActionGroup *group,
{ {
g_warning ("%s: Unable to set visibility of action " g_warning ("%s: Unable to set visibility of action "
"which doesn't exist: %s", "which doesn't exist: %s",
G_STRLOC, action_name); G_STRFUNC, action_name);
return; return;
} }
@ -597,7 +597,7 @@ gimp_action_group_set_action_sensitive (GimpActionGroup *group,
{ {
g_warning ("%s: Unable to set sensitivity of action " g_warning ("%s: Unable to set sensitivity of action "
"which doesn't exist: %s", "which doesn't exist: %s",
G_STRLOC, action_name); G_STRFUNC, action_name);
return; return;
} }
@ -620,7 +620,7 @@ gimp_action_group_set_action_active (GimpActionGroup *group,
{ {
g_warning ("%s: Unable to set \"active\" of action " g_warning ("%s: Unable to set \"active\" of action "
"which doesn't exist: %s", "which doesn't exist: %s",
G_STRLOC, action_name); G_STRFUNC, action_name);
return; return;
} }
@ -628,7 +628,7 @@ gimp_action_group_set_action_active (GimpActionGroup *group,
{ {
g_warning ("%s: Unable to set \"active\" of action " g_warning ("%s: Unable to set \"active\" of action "
"which is not a GtkToggleAction: %s", "which is not a GtkToggleAction: %s",
G_STRLOC, action_name); G_STRFUNC, action_name);
return; return;
} }
@ -652,7 +652,7 @@ gimp_action_group_set_action_label (GimpActionGroup *group,
{ {
g_warning ("%s: Unable to set label of action " g_warning ("%s: Unable to set label of action "
"which doesn't exist: %s", "which doesn't exist: %s",
G_STRLOC, action_name); G_STRFUNC, action_name);
return; return;
} }
@ -678,7 +678,7 @@ gimp_action_group_set_action_color (GimpActionGroup *group,
{ {
g_warning ("%s: Unable to set color of action " g_warning ("%s: Unable to set color of action "
"which doesn't exist: %s", "which doesn't exist: %s",
G_STRLOC, action_name); G_STRFUNC, action_name);
return; return;
} }
@ -763,7 +763,7 @@ gimp_action_group_set_action_viewable (GimpActionGroup *group,
{ {
g_warning ("%s: Unable to set viewable of action " g_warning ("%s: Unable to set viewable of action "
"which doesn't exist: %s", "which doesn't exist: %s",
G_STRLOC, action_name); G_STRFUNC, action_name);
return; return;
} }
@ -836,7 +836,7 @@ gimp_action_group_set_action_important (GimpActionGroup *group,
{ {
g_warning ("%s: Unable to set \"is-important\" of action " g_warning ("%s: Unable to set \"is-important\" of action "
"which doesn't exist: %s", "which doesn't exist: %s",
G_STRLOC, action_name); G_STRFUNC, action_name);
return; return;
} }

60
app/widgets/gimpdialogfactory.c
View File

@ -181,7 +181,7 @@ gimp_dialog_factory_dispose (GObject *object)
if (! list) if (! list)
{ {
g_warning ("%s: stale non-toplevel entries in factory->open_dialogs", g_warning ("%s: stale non-toplevel entries in factory->open_dialogs",
G_GNUC_FUNCTION); G_STRFUNC);
break; break;
} }
} }
@ -241,7 +241,7 @@ gimp_dialog_factory_new (const gchar *name,
if (gimp_dialog_factory_from_name (name)) if (gimp_dialog_factory_from_name (name))
{ {
g_warning ("%s: dialog factory \"%s\" already exists", g_warning ("%s: dialog factory \"%s\" already exists",
G_GNUC_FUNCTION, name); G_STRFUNC, name);
return NULL; return NULL;
} }
@ -384,14 +384,14 @@ gimp_dialog_factory_dialog_new_internal (GimpDialogFactory *factory,
if (! entry) if (! entry)
{ {
g_warning ("%s: no entry registered for \"%s\"", g_warning ("%s: no entry registered for \"%s\"",
G_GNUC_FUNCTION, identifier); G_STRFUNC, identifier);
return NULL; return NULL;
} }
if (! entry->new_func) if (! entry->new_func)
{ {
g_warning ("%s: entry for \"%s\" has no constructor", g_warning ("%s: entry for \"%s\" has no constructor",
G_GNUC_FUNCTION, identifier); G_STRFUNC, identifier);
return NULL; return NULL;
} }
@ -472,7 +472,7 @@ gimp_dialog_factory_dialog_new_internal (GimpDialogFactory *factory,
g_warning ("%s: GimpDialogFactory is a dockable factory " g_warning ("%s: GimpDialogFactory is a dockable factory "
"but constructor for \"%s\" did not return a " "but constructor for \"%s\" did not return a "
"GimpDockable", "GimpDockable",
G_GNUC_FUNCTION, identifier); G_STRFUNC, identifier);
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
gtk_widget_destroy (dock); gtk_widget_destroy (dock);
@ -485,7 +485,7 @@ gimp_dialog_factory_dialog_new_internal (GimpDialogFactory *factory,
else if (dock) else if (dock)
{ {
g_warning ("%s: constructor for \"%s\" returned NULL", g_warning ("%s: constructor for \"%s\" returned NULL",
G_GNUC_FUNCTION, identifier); G_STRFUNC, identifier);
gtk_widget_destroy (dock); gtk_widget_destroy (dock);
@ -724,7 +724,7 @@ gimp_dialog_factory_add_dialog (GimpDialogFactory *factory,
if (g_list_find (factory->open_dialogs, dialog)) if (g_list_find (factory->open_dialogs, dialog))
{ {
g_warning ("%s: dialog already registered", G_GNUC_FUNCTION); g_warning ("%s: dialog already registered", G_STRFUNC);
return; return;
} }
@ -733,14 +733,14 @@ gimp_dialog_factory_add_dialog (GimpDialogFactory *factory,
if (! (dialog_factory && (entry || GIMP_IS_DOCK (dialog)))) if (! (dialog_factory && (entry || GIMP_IS_DOCK (dialog))))
{ {
g_warning ("%s: dialog was not created by a GimpDialogFactory", g_warning ("%s: dialog was not created by a GimpDialogFactory",
G_GNUC_FUNCTION); G_STRFUNC);
return; return;
} }
if (dialog_factory != factory) if (dialog_factory != factory)
{ {
g_warning ("%s: dialog was created by a different GimpDialogFactory", g_warning ("%s: dialog was created by a different GimpDialogFactory",
G_GNUC_FUNCTION); G_STRFUNC);
return; return;
} }
@ -749,7 +749,7 @@ gimp_dialog_factory_add_dialog (GimpDialogFactory *factory,
if (entry) /* dialog is a toplevel (but not a GimpDock) or a GimpDockable */ if (entry) /* dialog is a toplevel (but not a GimpDock) or a GimpDockable */
{ {
D (g_print ("%s: adding %s \"%s\"\n", D (g_print ("%s: adding %s \"%s\"\n",
G_GNUC_FUNCTION, G_STRFUNC,
toplevel ? "toplevel" : "dockable", toplevel ? "toplevel" : "dockable",
entry->identifier)); entry->identifier));
@ -765,10 +765,10 @@ gimp_dialog_factory_add_dialog (GimpDialogFactory *factory,
if (entry->singleton) if (entry->singleton)
{ {
g_warning ("%s: singleton dialog \"%s\" created twice", g_warning ("%s: singleton dialog \"%s\" created twice",
G_GNUC_FUNCTION, entry->identifier); G_STRFUNC, entry->identifier);
D (g_print ("%s: corrupt session info: %p (widget %p)\n", D (g_print ("%s: corrupt session info: %p (widget %p)\n",
G_GNUC_FUNCTION, G_STRFUNC,
info, info->widget)); info, info->widget));
return; return;
@ -780,7 +780,7 @@ gimp_dialog_factory_add_dialog (GimpDialogFactory *factory,
info->widget = dialog; info->widget = dialog;
D (g_print ("%s: updating session info %p (widget %p) for %s \"%s\"\n", D (g_print ("%s: updating session info %p (widget %p) for %s \"%s\"\n",
G_GNUC_FUNCTION, G_STRFUNC,
info, info->widget, info, info->widget,
toplevel ? "toplevel" : "dockable", toplevel ? "toplevel" : "dockable",
entry->identifier)); entry->identifier));
@ -799,7 +799,7 @@ gimp_dialog_factory_add_dialog (GimpDialogFactory *factory,
info->widget = dialog; info->widget = dialog;
D (g_print ("%s: creating session info %p (widget %p) for %s \"%s\"\n", D (g_print ("%s: creating session info %p (widget %p) for %s \"%s\"\n",
G_GNUC_FUNCTION, G_STRFUNC,
info, info->widget, info, info->widget,
toplevel ? "toplevel" : "dockable", toplevel ? "toplevel" : "dockable",
entry->identifier)); entry->identifier));
@ -828,7 +828,7 @@ gimp_dialog_factory_add_dialog (GimpDialogFactory *factory,
} }
else /* dialog is a GimpDock */ else /* dialog is a GimpDock */
{ {
D (g_print ("%s: adding dock\n", G_GNUC_FUNCTION)); D (g_print ("%s: adding dock\n", G_STRFUNC));
for (list = factory->session_infos; list; list = g_list_next (list)) for (list = factory->session_infos; list; list = g_list_next (list))
{ {
@ -842,7 +842,7 @@ gimp_dialog_factory_add_dialog (GimpDialogFactory *factory,
info->widget = dialog; info->widget = dialog;
D (g_print ("%s: updating session info %p (widget %p) for dock\n", D (g_print ("%s: updating session info %p (widget %p) for dock\n",
G_GNUC_FUNCTION, G_STRFUNC,
info, info->widget)); info, info->widget));
gimp_session_info_set_geometry (info); gimp_session_info_set_geometry (info);
@ -858,7 +858,7 @@ gimp_dialog_factory_add_dialog (GimpDialogFactory *factory,
info->widget = dialog; info->widget = dialog;
D (g_print ("%s: creating session info %p (widget %p) for dock\n", D (g_print ("%s: creating session info %p (widget %p) for dock\n",
G_GNUC_FUNCTION, G_STRFUNC,
info, info->widget)); info, info->widget));
/* if we create a new session info, we never call /* if we create a new session info, we never call
@ -906,7 +906,7 @@ gimp_dialog_factory_add_foreign (GimpDialogFactory *factory,
if (dialog_factory || entry) if (dialog_factory || entry)
{ {
g_warning ("%s: dialog was created by a GimpDialogFactory", g_warning ("%s: dialog was created by a GimpDialogFactory",
G_GNUC_FUNCTION); G_STRFUNC);
return; return;
} }
@ -915,14 +915,14 @@ gimp_dialog_factory_add_foreign (GimpDialogFactory *factory,
if (! entry) if (! entry)
{ {
g_warning ("%s: no entry registered for \"%s\"", g_warning ("%s: no entry registered for \"%s\"",
G_GNUC_FUNCTION, identifier); G_STRFUNC, identifier);
return; return;
} }
if (entry->new_func) if (entry->new_func)
{ {
g_warning ("%s: entry for \"%s\" has a constructor (is not foreign)", g_warning ("%s: entry for \"%s\" has a constructor (is not foreign)",
G_GNUC_FUNCTION, identifier); G_STRFUNC, identifier);
return; return;
} }
@ -945,7 +945,7 @@ gimp_dialog_factory_remove_dialog (GimpDialogFactory *factory,
if (! g_list_find (factory->open_dialogs, dialog)) if (! g_list_find (factory->open_dialogs, dialog))
{ {
g_warning ("%s: dialog not registered", G_GNUC_FUNCTION); g_warning ("%s: dialog not registered", G_STRFUNC);
return; return;
} }
@ -956,19 +956,19 @@ gimp_dialog_factory_remove_dialog (GimpDialogFactory *factory,
if (! (dialog_factory && (entry || GIMP_IS_DOCK (dialog)))) if (! (dialog_factory && (entry || GIMP_IS_DOCK (dialog))))
{ {
g_warning ("%s: dialog was not created by a GimpDialogFactory", g_warning ("%s: dialog was not created by a GimpDialogFactory",
G_GNUC_FUNCTION); G_STRFUNC);
return; return;
} }
if (dialog_factory != factory) if (dialog_factory != factory)
{ {
g_warning ("%s: dialog was created by a different GimpDialogFactory", g_warning ("%s: dialog was created by a different GimpDialogFactory",
G_GNUC_FUNCTION); G_STRFUNC);
return; return;
} }
D (g_print ("%s: removing \"%s\"\n", D (g_print ("%s: removing \"%s\"\n",
G_GNUC_FUNCTION, G_STRFUNC,
entry ? entry->identifier : "dock")); entry ? entry->identifier : "dock"));
for (list = factory->session_infos; list; list = g_list_next (list)) for (list = factory->session_infos; list; list = g_list_next (list))
@ -978,7 +978,7 @@ gimp_dialog_factory_remove_dialog (GimpDialogFactory *factory,
if (session_info->widget == dialog) if (session_info->widget == dialog)
{ {
D (g_print ("%s: clearing session info %p (widget %p) for \"%s\"\n", D (g_print ("%s: clearing session info %p (widget %p) for \"%s\"\n",
G_GNUC_FUNCTION, G_STRFUNC,
session_info, session_info->widget, session_info, session_info->widget,
entry ? entry->identifier : "dock")); entry ? entry->identifier : "dock"));
@ -1171,7 +1171,7 @@ gimp_dialog_factory_set_user_pos (GtkWidget *dialog,
if (entry) if (entry)
g_print ("%s: setting GDK_HINT_USER_POS for \"%s\"\n", g_print ("%s: setting GDK_HINT_USER_POS for \"%s\"\n",
G_GNUC_FUNCTION, entry->identifier); G_STRFUNC, entry->identifier);
#endif /* DEBUG_FACTORY */ #endif /* DEBUG_FACTORY */
g_signal_handlers_disconnect_by_func (dialog, g_signal_handlers_disconnect_by_func (dialog,
@ -1195,7 +1195,7 @@ gimp_dialog_factory_dialog_configure (GtkWidget *dialog,
if (! g_list_find (factory->open_dialogs, dialog)) if (! g_list_find (factory->open_dialogs, dialog))
{ {
g_warning ("%s: dialog not registered", G_GNUC_FUNCTION); g_warning ("%s: dialog not registered", G_STRFUNC);
return FALSE; return FALSE;
} }
@ -1204,14 +1204,14 @@ gimp_dialog_factory_dialog_configure (GtkWidget *dialog,
if (! dialog_factory || ! entry) if (! dialog_factory || ! entry)
{ {
g_warning ("%s: dialog was not created by a GimpDialogFactory", g_warning ("%s: dialog was not created by a GimpDialogFactory",
G_GNUC_FUNCTION); G_STRFUNC);
return FALSE; return FALSE;
} }
if (dialog_factory != factory) if (dialog_factory != factory)
{ {
g_warning ("%s: dialog was created by a different GimpDialogFactory", g_warning ("%s: dialog was created by a different GimpDialogFactory",
G_GNUC_FUNCTION); G_STRFUNC);
return FALSE; return FALSE;
} }
@ -1222,7 +1222,7 @@ gimp_dialog_factory_dialog_configure (GtkWidget *dialog,
if (session_info->widget == dialog) if (session_info->widget == dialog)
{ {
D (g_print ("%s: updating session info for \"%s\" from window geometry\n", D (g_print ("%s: updating session info for \"%s\" from window geometry\n",
G_GNUC_FUNCTION, entry->identifier)); G_STRFUNC, entry->identifier));
gimp_session_info_get_geometry (session_info); gimp_session_info_get_geometry (session_info);

8
app/widgets/gimpgradienteditor.c
View File

@ -1107,7 +1107,7 @@ control_do_hint (GimpGradientEditor *editor,
default: default:
g_warning ("%s: in_handle is true, but received handle type %d.", g_warning ("%s: in_handle is true, but received handle type %d.",
G_STRLOC, in_handle); G_STRFUNC, in_handle);
break; break;
} }
} }
@ -1242,7 +1242,7 @@ control_button_press (GimpGradientEditor *editor,
default: default:
g_warning ("%s: in_handle is true, but received handle type %d.", g_warning ("%s: in_handle is true, but received handle type %d.",
G_STRLOC, in_handle); G_STRFUNC, in_handle);
return; return;
} }
} }
@ -1293,7 +1293,7 @@ control_point_in_handle (GimpGradientEditor *editor,
break; break;
default: default:
g_warning ("%s: Cannot handle drag mode %d.", G_STRLOC, handle); g_warning ("%s: Cannot handle drag mode %d.", G_STRFUNC, handle);
return FALSE; return FALSE;
} }
@ -1392,7 +1392,7 @@ control_motion (GimpGradientEditor *editor,
default: default:
g_warning ("%s: Attempting to move bogus handle %d.", g_warning ("%s: Attempting to move bogus handle %d.",
G_STRLOC, editor->control_drag_mode); G_STRFUNC, editor->control_drag_mode);
break; break;
} }

20
app/widgets/gimpitemfactory.c
View File

@ -488,7 +488,7 @@ gimp_item_factory_set_active (GtkItemFactory *factory,
{ {
g_warning ("%s: Unable to set \"active\" for menu item " g_warning ("%s: Unable to set \"active\" for menu item "
"of type \"%s\": %s", "of type \"%s\": %s",
G_STRLOC, G_STRFUNC,
g_type_name (G_TYPE_FROM_INSTANCE (widget)), g_type_name (G_TYPE_FROM_INSTANCE (widget)),
path); path);
} }
@ -497,7 +497,7 @@ gimp_item_factory_set_active (GtkItemFactory *factory,
{ {
g_warning ("%s: Unable to set \"active\" for menu item " g_warning ("%s: Unable to set \"active\" for menu item "
"which doesn't exist: %s", "which doesn't exist: %s",
G_STRLOC, path); G_STRFUNC, path);
} }
} }
@ -541,7 +541,7 @@ gimp_item_factory_set_color (GtkItemFactory *factory,
{ {
g_warning ("%s: Unable to set color of menu item " g_warning ("%s: Unable to set color of menu item "
"which doesn't exist: %s", "which doesn't exist: %s",
G_STRLOC, path); G_STRFUNC, path);
return; return;
} }
@ -650,7 +650,7 @@ gimp_item_factory_set_label (GtkItemFactory *factory,
{ {
g_warning ("%s: Unable to set label of menu item " g_warning ("%s: Unable to set label of menu item "
"which doesn't exist: %s", "which doesn't exist: %s",
G_STRLOC, path); G_STRFUNC, path);
} }
} }
@ -694,7 +694,7 @@ gimp_item_factory_set_sensitive (GtkItemFactory *factory,
{ {
g_warning ("%s: Unable to set sensitivity of menu item " g_warning ("%s: Unable to set sensitivity of menu item "
"which doesn't exist: %s", "which doesn't exist: %s",
G_STRLOC, path); G_STRFUNC, path);
} }
} }
@ -743,7 +743,7 @@ gimp_item_factory_set_visible (GtkItemFactory *factory,
{ {
g_warning ("%s: Unable to set visibility of menu item " g_warning ("%s: Unable to set visibility of menu item "
"which doesn't exist: %s", "which doesn't exist: %s",
G_STRLOC, path); G_STRFUNC, path);
} }
} }
@ -784,7 +784,7 @@ gimp_item_factory_tearoff_callback (GtkWidget *widget,
if (! GTK_IS_WINDOW (toplevel)) if (! GTK_IS_WINDOW (toplevel))
{ {
g_warning ("%s: tearoff menu not in top level window", g_warning ("%s: tearoff menu not in top level window",
G_STRLOC); G_STRFUNC);
} }
else else
{ {
@ -805,7 +805,7 @@ gimp_item_factory_tearoff_callback (GtkWidget *widget,
if (! toplevel) if (! toplevel)
{ {
g_warning ("%s: can't unregister tearoff menu top level window", g_warning ("%s: can't unregister tearoff menu top level window",
G_STRLOC); G_STRFUNC);
} }
else else
{ {
@ -1117,7 +1117,7 @@ gimp_item_factory_translate (const gchar *path,
else else
{ {
g_warning ("%s: bad translation for menupath: %s", g_warning ("%s: bad translation for menupath: %s",
G_STRLOC, full_path); G_STRFUNC, full_path);
retval = path; retval = path;
} }
@ -1165,7 +1165,7 @@ gimp_item_factory_translate (const gchar *path,
else else
{ {
g_warning ("%s: bad translation for menupath: %s", g_warning ("%s: bad translation for menupath: %s",
G_STRLOC, path); G_STRFUNC, path);
retval = path; retval = path;
} }

72
app/widgets/gimppropwidgets.c
View File

@ -97,7 +97,7 @@ gimp_prop_check_button_new (GObject *config,
gboolean value; gboolean value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_BOOLEAN, G_STRLOC); G_TYPE_PARAM_BOOLEAN, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -183,7 +183,7 @@ gimp_prop_enum_check_button_new (GObject *config,
gint value; gint value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC); G_TYPE_PARAM_ENUM, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -307,7 +307,7 @@ gimp_prop_enum_combo_box_new (GObject *config,
gint value; gint value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC); G_TYPE_PARAM_ENUM, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -404,7 +404,7 @@ gimp_prop_boolean_combo_box_new (GObject *config,
gboolean value; gboolean value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_BOOLEAN, G_STRLOC); G_TYPE_PARAM_BOOLEAN, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -485,7 +485,7 @@ gimp_prop_paint_mode_menu_new (GObject *config,
gint value; gint value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC); G_TYPE_PARAM_ENUM, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -575,7 +575,7 @@ gimp_prop_enum_radio_frame_new (GObject *config,
gint value; gint value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC); G_TYPE_PARAM_ENUM, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -628,7 +628,7 @@ gimp_prop_enum_radio_box_new (GObject *config,
gint value; gint value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC); G_TYPE_PARAM_ENUM, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -678,7 +678,7 @@ gimp_prop_boolean_radio_frame_new (GObject *config,
gboolean value; gboolean value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_BOOLEAN, G_STRLOC); G_TYPE_PARAM_BOOLEAN, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -720,7 +720,7 @@ gimp_prop_enum_stock_box_new (GObject *config,
gint value; gint value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC); G_TYPE_PARAM_ENUM, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -820,12 +820,12 @@ gimp_prop_spin_button_new (GObject *config,
gdouble lower; gdouble lower;
gdouble upper; gdouble upper;
param_spec = find_param_spec (config, property_name, G_STRLOC); param_spec = find_param_spec (config, property_name, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
if (! get_numeric_values (config, if (! get_numeric_values (config,
param_spec, &value, &lower, &upper, G_STRLOC)) param_spec, &value, &lower, &upper, G_STRFUNC))
return NULL; return NULL;
if (! G_IS_PARAM_SPEC_DOUBLE (param_spec)) if (! G_IS_PARAM_SPEC_DOUBLE (param_spec))
@ -870,12 +870,12 @@ gimp_prop_scale_entry_new (GObject *config,
gdouble lower; gdouble lower;
gdouble upper; gdouble upper;
param_spec = find_param_spec (config, property_name, G_STRLOC); param_spec = find_param_spec (config, property_name, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
if (! get_numeric_values (config, if (! get_numeric_values (config,
param_spec, &value, &lower, &upper, G_STRLOC)) param_spec, &value, &lower, &upper, G_STRFUNC))
return NULL; return NULL;
tooltip = gettext (g_param_spec_get_blurb (param_spec)); tooltip = gettext (g_param_spec_get_blurb (param_spec));
@ -932,7 +932,7 @@ gimp_prop_opacity_entry_new (GObject *config,
gdouble upper; gdouble upper;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_DOUBLE, G_STRLOC); G_TYPE_PARAM_DOUBLE, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -1098,7 +1098,7 @@ gimp_prop_adjustment_notify (GObject *config,
else else
{ {
g_warning ("%s: unhandled param spec of type %s", g_warning ("%s: unhandled param spec of type %s",
G_STRLOC, G_PARAM_SPEC_TYPE_NAME (param_spec)); G_STRFUNC, G_PARAM_SPEC_TYPE_NAME (param_spec));
return; return;
} }
@ -1137,7 +1137,7 @@ gimp_prop_memsize_entry_new (GObject *config,
guint64 value; guint64 value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
GIMP_TYPE_PARAM_MEMSIZE, G_STRLOC); GIMP_TYPE_PARAM_MEMSIZE, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -1235,7 +1235,7 @@ gimp_prop_entry_new (GObject *config,
gchar *value; gchar *value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_STRING, G_STRLOC); G_TYPE_PARAM_STRING, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -1335,7 +1335,7 @@ gimp_prop_text_buffer_new (GObject *config,
gchar *value; gchar *value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_STRING, G_STRLOC); G_TYPE_PARAM_STRING, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -1464,7 +1464,7 @@ gimp_prop_file_entry_new (GObject *config,
gchar *value; gchar *value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
GIMP_TYPE_PARAM_PATH, G_STRLOC); GIMP_TYPE_PARAM_PATH, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -1581,14 +1581,14 @@ gimp_prop_path_editor_new (GObject *config,
gchar *filename; gchar *filename;
path_param_spec = check_param_spec (config, path_property_name, path_param_spec = check_param_spec (config, path_property_name,
GIMP_TYPE_PARAM_PATH, G_STRLOC); GIMP_TYPE_PARAM_PATH, G_STRFUNC);
if (! path_param_spec) if (! path_param_spec)
return NULL; return NULL;
if (writable_property_name) if (writable_property_name)
{ {
writable_param_spec = check_param_spec (config, writable_property_name, writable_param_spec = check_param_spec (config, writable_property_name,
GIMP_TYPE_PARAM_PATH, G_STRLOC); GIMP_TYPE_PARAM_PATH, G_STRFUNC);
if (! writable_param_spec) if (! writable_param_spec)
return NULL; return NULL;
} }
@ -1820,12 +1820,12 @@ gimp_prop_size_entry_new (GObject *config,
gdouble upper; gdouble upper;
GimpUnit unit_value; GimpUnit unit_value;
param_spec = find_param_spec (config, property_name, G_STRLOC); param_spec = find_param_spec (config, property_name, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
if (! get_numeric_values (config, if (! get_numeric_values (config,
param_spec, &value, &lower, &upper, G_STRLOC)) param_spec, &value, &lower, &upper, G_STRFUNC))
return NULL; return NULL;
if (unit_property_name) if (unit_property_name)
@ -1833,7 +1833,7 @@ gimp_prop_size_entry_new (GObject *config,
GValue value = { 0 }; GValue value = { 0 };
unit_param_spec = check_param_spec (config, unit_property_name, unit_param_spec = check_param_spec (config, unit_property_name,
GIMP_TYPE_PARAM_UNIT, G_STRLOC); GIMP_TYPE_PARAM_UNIT, G_STRFUNC);
if (! unit_param_spec) if (! unit_param_spec)
return NULL; return NULL;
@ -2111,24 +2111,24 @@ gimp_prop_coordinates_connect (GObject *config,
g_return_val_if_fail (chainbutton == NULL || g_return_val_if_fail (chainbutton == NULL ||
GIMP_IS_CHAIN_BUTTON (chainbutton), FALSE); GIMP_IS_CHAIN_BUTTON (chainbutton), FALSE);
x_param_spec = find_param_spec (config, x_property_name, G_STRLOC); x_param_spec = find_param_spec (config, x_property_name, G_STRFUNC);
if (! x_param_spec) if (! x_param_spec)
return FALSE; return FALSE;
y_param_spec = find_param_spec (config, y_property_name, G_STRLOC); y_param_spec = find_param_spec (config, y_property_name, G_STRFUNC);
if (! y_param_spec) if (! y_param_spec)
return FALSE; return FALSE;
if (! get_numeric_values (config, x_param_spec, if (! get_numeric_values (config, x_param_spec,
&x_value, &x_lower, &x_upper, G_STRLOC) || &x_value, &x_lower, &x_upper, G_STRFUNC) ||
! get_numeric_values (config, y_param_spec, ! get_numeric_values (config, y_param_spec,
&y_value, &y_lower, &y_upper, G_STRLOC)) &y_value, &y_lower, &y_upper, G_STRFUNC))
return FALSE; return FALSE;
if (unit_property_name) if (unit_property_name)
{ {
unit_param_spec = check_param_spec (config, unit_property_name, unit_param_spec = check_param_spec (config, unit_property_name,
GIMP_TYPE_PARAM_UNIT, G_STRLOC); GIMP_TYPE_PARAM_UNIT, G_STRFUNC);
if (! unit_param_spec) if (! unit_param_spec)
return FALSE; return FALSE;
@ -2456,7 +2456,7 @@ gimp_prop_color_area_new (GObject *config,
GimpRGB *value; GimpRGB *value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
GIMP_TYPE_PARAM_COLOR, G_STRLOC); GIMP_TYPE_PARAM_COLOR, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -2557,7 +2557,7 @@ gimp_prop_color_button_new (GObject *config,
GimpRGB *value; GimpRGB *value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
GIMP_TYPE_PARAM_COLOR, G_STRLOC); GIMP_TYPE_PARAM_COLOR, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -2656,7 +2656,7 @@ gimp_prop_unit_menu_new (GObject *config,
gboolean show_percent; gboolean show_percent;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
GIMP_TYPE_PARAM_UNIT, G_STRLOC); GIMP_TYPE_PARAM_UNIT, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -2760,14 +2760,14 @@ gimp_prop_preview_new (GObject *config,
GimpViewable *viewable; GimpViewable *viewable;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_OBJECT, G_STRLOC); G_TYPE_PARAM_OBJECT, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
if (! g_type_is_a (param_spec->value_type, GIMP_TYPE_VIEWABLE)) if (! g_type_is_a (param_spec->value_type, GIMP_TYPE_VIEWABLE))
{ {
g_warning ("%s: property '%s' of %s is not a GimpViewable", g_warning ("%s: property '%s' of %s is not a GimpViewable",
G_STRLOC, property_name, G_STRFUNC, property_name,
g_type_name (G_TYPE_FROM_INSTANCE (config))); g_type_name (G_TYPE_FROM_INSTANCE (config)));
return NULL; return NULL;
} }
@ -2779,7 +2779,7 @@ gimp_prop_preview_new (GObject *config,
if (! preview) if (! preview)
{ {
g_warning ("%s: cannot create preview for type '%s'", g_warning ("%s: cannot create preview for type '%s'",
G_STRLOC, g_type_name (param_spec->value_type)); G_STRFUNC, g_type_name (param_spec->value_type));
return NULL; return NULL;
} }
@ -2861,7 +2861,7 @@ gimp_prop_stock_image_new (GObject *config,
gchar *stock_id; gchar *stock_id;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_STRING, G_STRLOC); G_TYPE_PARAM_STRING, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;

3
app/widgets/gimpwidgets-utils.c
View File

@ -417,8 +417,7 @@ gimp_button_menu_position (GtkWidget *button,
break; break;
default: default:
g_warning ("gimp_button_menu_position: " g_warning ("%s: unhandled position (%d)", G_STRFUNC, position);
"unhandled position (%d)", position);
break; break;
} }

3
app/xcf/xcf-save.c
View File

@ -859,7 +859,8 @@ xcf_save_prop (XcfInfo *info,
break; break;
default: default:
g_warning ("xcf_save_prop: skipping guide with bad orientation"); g_warning ("%s: skipping guide with bad orientation",
G_STRFUNC);
continue; continue;
} }

2
libgimp/gimpexport.c
View File

@ -674,7 +674,7 @@ gimp_export_image (gint32 *image_ID,
else else
{ {
/* this should not happen */ /* this should not happen */
g_warning ("gimp_export_image: unknown drawable type!"); g_warning ("%s: unknown drawable type!", G_STRFUNC);
} }
/* cancel - the user can then select an appropriate layer to save */ /* cancel - the user can then select an appropriate layer to save */

5
libgimpconfig/gimpconfig-deserialize.c
View File

@ -314,7 +314,8 @@ gimp_config_deserialize_property (GimpConfig *config,
#ifdef CONFIG_DEBUG #ifdef CONFIG_DEBUG
else else
{ {
g_warning ("couldn't deserialize property %s::%s of type %s", g_warning ("%s: couldn't deserialize property %s::%s of type %s",
G_STRFUNC,
g_type_name (G_TYPE_FROM_INSTANCE (config)), g_type_name (G_TYPE_FROM_INSTANCE (config)),
prop_spec->name, prop_spec->name,
g_type_name (prop_spec->value_type)); g_type_name (prop_spec->value_type));
@ -731,7 +732,7 @@ gimp_config_deserialize_any (GValue *value,
if (!g_value_type_transformable (G_TYPE_STRING, prop_spec->value_type)) if (!g_value_type_transformable (G_TYPE_STRING, prop_spec->value_type))
{ {
g_warning ("%s: %s can not be transformed from a string", g_warning ("%s: %s can not be transformed from a string",
G_STRLOC, g_type_name (prop_spec->value_type)); G_STRFUNC, g_type_name (prop_spec->value_type));
return G_TOKEN_NONE; return G_TOKEN_NONE;
} }

2
libgimpconfig/gimpscanner.c
View File

@ -167,7 +167,7 @@ gimp_scanner_destroy (GScanner *scanner)
{ {
if (close (data->fd)) if (close (data->fd))
g_warning ("%s: could not close file descriptor: %s", g_warning ("%s: could not close file descriptor: %s",
G_GNUC_PRETTY_FUNCTION, g_strerror (errno)); G_STRFUNC, g_strerror (errno));
} }
g_free (data->name); g_free (data->name);

4
libgimpwidgets/gimphelpui.c
View File

@ -123,8 +123,8 @@ gimp_standard_help_func (const gchar *help_id,
{ {
if (! _gimp_standard_help_func) if (! _gimp_standard_help_func)
{ {
g_warning ("gimp_standard_help_func(): you must call gimp_widgets_init() " g_warning ("%s: you must call gimp_widgets_init() before using "
"before using the help system"); "the help system", G_STRFUNC);
return; return;
} }

2
libgimpwidgets/gimppixmap.c
View File

@ -131,7 +131,7 @@ gimp_pixmap_set (GimpPixmap *pixmap,
if (sscanf (xpm_data[0], "%d %d", &width, &height) != 2) if (sscanf (xpm_data[0], "%d %d", &width, &height) != 2)
{ {
g_warning ("%s: passed pointer is no XPM data", G_STRLOC); g_warning ("%s: passed pointer is no XPM data", G_STRFUNC);
} }
else else
{ {

72
libgimpwidgets/gimppropwidgets.c
View File

@ -97,7 +97,7 @@ gimp_prop_check_button_new (GObject *config,
gboolean value; gboolean value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_BOOLEAN, G_STRLOC); G_TYPE_PARAM_BOOLEAN, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -183,7 +183,7 @@ gimp_prop_enum_check_button_new (GObject *config,
gint value; gint value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC); G_TYPE_PARAM_ENUM, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -307,7 +307,7 @@ gimp_prop_enum_combo_box_new (GObject *config,
gint value; gint value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC); G_TYPE_PARAM_ENUM, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -404,7 +404,7 @@ gimp_prop_boolean_combo_box_new (GObject *config,
gboolean value; gboolean value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_BOOLEAN, G_STRLOC); G_TYPE_PARAM_BOOLEAN, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -485,7 +485,7 @@ gimp_prop_paint_mode_menu_new (GObject *config,
gint value; gint value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC); G_TYPE_PARAM_ENUM, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -575,7 +575,7 @@ gimp_prop_enum_radio_frame_new (GObject *config,
gint value; gint value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC); G_TYPE_PARAM_ENUM, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -628,7 +628,7 @@ gimp_prop_enum_radio_box_new (GObject *config,
gint value; gint value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC); G_TYPE_PARAM_ENUM, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -678,7 +678,7 @@ gimp_prop_boolean_radio_frame_new (GObject *config,
gboolean value; gboolean value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_BOOLEAN, G_STRLOC); G_TYPE_PARAM_BOOLEAN, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -720,7 +720,7 @@ gimp_prop_enum_stock_box_new (GObject *config,
gint value; gint value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC); G_TYPE_PARAM_ENUM, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -820,12 +820,12 @@ gimp_prop_spin_button_new (GObject *config,
gdouble lower; gdouble lower;
gdouble upper; gdouble upper;
param_spec = find_param_spec (config, property_name, G_STRLOC); param_spec = find_param_spec (config, property_name, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
if (! get_numeric_values (config, if (! get_numeric_values (config,
param_spec, &value, &lower, &upper, G_STRLOC)) param_spec, &value, &lower, &upper, G_STRFUNC))
return NULL; return NULL;
if (! G_IS_PARAM_SPEC_DOUBLE (param_spec)) if (! G_IS_PARAM_SPEC_DOUBLE (param_spec))
@ -870,12 +870,12 @@ gimp_prop_scale_entry_new (GObject *config,
gdouble lower; gdouble lower;
gdouble upper; gdouble upper;
param_spec = find_param_spec (config, property_name, G_STRLOC); param_spec = find_param_spec (config, property_name, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
if (! get_numeric_values (config, if (! get_numeric_values (config,
param_spec, &value, &lower, &upper, G_STRLOC)) param_spec, &value, &lower, &upper, G_STRFUNC))
return NULL; return NULL;
tooltip = gettext (g_param_spec_get_blurb (param_spec)); tooltip = gettext (g_param_spec_get_blurb (param_spec));
@ -932,7 +932,7 @@ gimp_prop_opacity_entry_new (GObject *config,
gdouble upper; gdouble upper;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_DOUBLE, G_STRLOC); G_TYPE_PARAM_DOUBLE, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -1098,7 +1098,7 @@ gimp_prop_adjustment_notify (GObject *config,
else else
{ {
g_warning ("%s: unhandled param spec of type %s", g_warning ("%s: unhandled param spec of type %s",
G_STRLOC, G_PARAM_SPEC_TYPE_NAME (param_spec)); G_STRFUNC, G_PARAM_SPEC_TYPE_NAME (param_spec));
return; return;
} }
@ -1137,7 +1137,7 @@ gimp_prop_memsize_entry_new (GObject *config,
guint64 value; guint64 value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
GIMP_TYPE_PARAM_MEMSIZE, G_STRLOC); GIMP_TYPE_PARAM_MEMSIZE, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -1235,7 +1235,7 @@ gimp_prop_entry_new (GObject *config,
gchar *value; gchar *value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_STRING, G_STRLOC); G_TYPE_PARAM_STRING, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -1335,7 +1335,7 @@ gimp_prop_text_buffer_new (GObject *config,
gchar *value; gchar *value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_STRING, G_STRLOC); G_TYPE_PARAM_STRING, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -1464,7 +1464,7 @@ gimp_prop_file_entry_new (GObject *config,
gchar *value; gchar *value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
GIMP_TYPE_PARAM_PATH, G_STRLOC); GIMP_TYPE_PARAM_PATH, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -1581,14 +1581,14 @@ gimp_prop_path_editor_new (GObject *config,
gchar *filename; gchar *filename;
path_param_spec = check_param_spec (config, path_property_name, path_param_spec = check_param_spec (config, path_property_name,
GIMP_TYPE_PARAM_PATH, G_STRLOC); GIMP_TYPE_PARAM_PATH, G_STRFUNC);
if (! path_param_spec) if (! path_param_spec)
return NULL; return NULL;
if (writable_property_name) if (writable_property_name)
{ {
writable_param_spec = check_param_spec (config, writable_property_name, writable_param_spec = check_param_spec (config, writable_property_name,
GIMP_TYPE_PARAM_PATH, G_STRLOC); GIMP_TYPE_PARAM_PATH, G_STRFUNC);
if (! writable_param_spec) if (! writable_param_spec)
return NULL; return NULL;
} }
@ -1820,12 +1820,12 @@ gimp_prop_size_entry_new (GObject *config,
gdouble upper; gdouble upper;
GimpUnit unit_value; GimpUnit unit_value;
param_spec = find_param_spec (config, property_name, G_STRLOC); param_spec = find_param_spec (config, property_name, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
if (! get_numeric_values (config, if (! get_numeric_values (config,
param_spec, &value, &lower, &upper, G_STRLOC)) param_spec, &value, &lower, &upper, G_STRFUNC))
return NULL; return NULL;
if (unit_property_name) if (unit_property_name)
@ -1833,7 +1833,7 @@ gimp_prop_size_entry_new (GObject *config,
GValue value = { 0 }; GValue value = { 0 };
unit_param_spec = check_param_spec (config, unit_property_name, unit_param_spec = check_param_spec (config, unit_property_name,
GIMP_TYPE_PARAM_UNIT, G_STRLOC); GIMP_TYPE_PARAM_UNIT, G_STRFUNC);
if (! unit_param_spec) if (! unit_param_spec)
return NULL; return NULL;
@ -2111,24 +2111,24 @@ gimp_prop_coordinates_connect (GObject *config,
g_return_val_if_fail (chainbutton == NULL || g_return_val_if_fail (chainbutton == NULL ||
GIMP_IS_CHAIN_BUTTON (chainbutton), FALSE); GIMP_IS_CHAIN_BUTTON (chainbutton), FALSE);
x_param_spec = find_param_spec (config, x_property_name, G_STRLOC); x_param_spec = find_param_spec (config, x_property_name, G_STRFUNC);
if (! x_param_spec) if (! x_param_spec)
return FALSE; return FALSE;
y_param_spec = find_param_spec (config, y_property_name, G_STRLOC); y_param_spec = find_param_spec (config, y_property_name, G_STRFUNC);
if (! y_param_spec) if (! y_param_spec)
return FALSE; return FALSE;
if (! get_numeric_values (config, x_param_spec, if (! get_numeric_values (config, x_param_spec,
&x_value, &x_lower, &x_upper, G_STRLOC) || &x_value, &x_lower, &x_upper, G_STRFUNC) ||
! get_numeric_values (config, y_param_spec, ! get_numeric_values (config, y_param_spec,
&y_value, &y_lower, &y_upper, G_STRLOC)) &y_value, &y_lower, &y_upper, G_STRFUNC))
return FALSE; return FALSE;
if (unit_property_name) if (unit_property_name)
{ {
unit_param_spec = check_param_spec (config, unit_property_name, unit_param_spec = check_param_spec (config, unit_property_name,
GIMP_TYPE_PARAM_UNIT, G_STRLOC); GIMP_TYPE_PARAM_UNIT, G_STRFUNC);
if (! unit_param_spec) if (! unit_param_spec)
return FALSE; return FALSE;
@ -2456,7 +2456,7 @@ gimp_prop_color_area_new (GObject *config,
GimpRGB *value; GimpRGB *value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
GIMP_TYPE_PARAM_COLOR, G_STRLOC); GIMP_TYPE_PARAM_COLOR, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -2557,7 +2557,7 @@ gimp_prop_color_button_new (GObject *config,
GimpRGB *value; GimpRGB *value;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
GIMP_TYPE_PARAM_COLOR, G_STRLOC); GIMP_TYPE_PARAM_COLOR, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -2656,7 +2656,7 @@ gimp_prop_unit_menu_new (GObject *config,
gboolean show_percent; gboolean show_percent;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
GIMP_TYPE_PARAM_UNIT, G_STRLOC); GIMP_TYPE_PARAM_UNIT, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
@ -2760,14 +2760,14 @@ gimp_prop_preview_new (GObject *config,
GimpViewable *viewable; GimpViewable *viewable;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_OBJECT, G_STRLOC); G_TYPE_PARAM_OBJECT, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;
if (! g_type_is_a (param_spec->value_type, GIMP_TYPE_VIEWABLE)) if (! g_type_is_a (param_spec->value_type, GIMP_TYPE_VIEWABLE))
{ {
g_warning ("%s: property '%s' of %s is not a GimpViewable", g_warning ("%s: property '%s' of %s is not a GimpViewable",
G_STRLOC, property_name, G_STRFUNC, property_name,
g_type_name (G_TYPE_FROM_INSTANCE (config))); g_type_name (G_TYPE_FROM_INSTANCE (config)));
return NULL; return NULL;
} }
@ -2779,7 +2779,7 @@ gimp_prop_preview_new (GObject *config,
if (! preview) if (! preview)
{ {
g_warning ("%s: cannot create preview for type '%s'", g_warning ("%s: cannot create preview for type '%s'",
G_STRLOC, g_type_name (param_spec->value_type)); G_STRFUNC, g_type_name (param_spec->value_type));
return NULL; return NULL;
} }
@ -2861,7 +2861,7 @@ gimp_prop_stock_image_new (GObject *config,
gchar *stock_id; gchar *stock_id;
param_spec = check_param_spec (config, property_name, param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_STRING, G_STRLOC); G_TYPE_PARAM_STRING, G_STRFUNC);
if (! param_spec) if (! param_spec)
return NULL; return NULL;

8
libgimpwidgets/gimpunitmenu.c
View File

@ -506,7 +506,8 @@ gimp_unit_menu_build_string (const gchar *format,
switch (*format) switch (*format)
{ {
case 0: case 0:
g_warning ("unit-menu-format string ended within %%-sequence"); g_warning ("%s: unit-menu-format string ended within %%-sequence",
G_STRFUNC);
break; break;
case '%': case '%':
@ -539,9 +540,8 @@ gimp_unit_menu_build_string (const gchar *format,
break; break;
default: default:
g_warning ("gimp_unit_menu_build_string(): " g_warning ("%s: unit-menu-format contains unknown format "
"unit-menu-format contains unknown format sequence " "sequence '%%%c'", G_STRFUNC, *format);
"'%%%c'", *format);
break; break;
} }
break; break;