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

Remove GIMP_OBJECT() casts when calling gimp_object_get_name()

This commit is contained in:
Michael Natterer 2009-08-31 22:47:18 +02:00
parent a0e1fe6a21
commit a3558e3cb8
95 changed files with 233 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ channels_edit_attributes_cmd_callback (GtkAction *action,
action_data_get_context (data),
widget,
&channel->color,
gimp_object_get_name (GIMP_OBJECT (channel)),
gimp_object_get_name (channel),
_("Channel Attributes"),
"gimp-channel-edit",
GTK_STOCK_EDIT,
@ -392,7 +392,7 @@ channels_edit_channel_response (GtkWidget *widget,
gimp_color_button_get_color (GIMP_COLOR_BUTTON (options->color_panel),
&color);
if (strcmp (new_name, gimp_object_get_name (GIMP_OBJECT (channel))))
if (strcmp (new_name, gimp_object_get_name (channel)))
name_changed = TRUE;
if (gimp_rgba_distance (&color, &channel->color) > 0.0001)

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

@ -113,7 +113,7 @@ documents_raise_or_open_cmd_callback (GtkAction *action,
{
RaiseClosure closure;
closure.name = gimp_object_get_name (GIMP_OBJECT (imagefile));
closure.name = gimp_object_get_name (imagefile);
closure.found = FALSE;
gimp_container_foreach (context->gimp->displays,
@ -142,7 +142,7 @@ documents_file_open_dialog_cmd_callback (GtkAction *action,
if (imagefile && gimp_container_have (container, GIMP_OBJECT (imagefile)))
{
file_file_open_dialog (context->gimp,
gimp_object_get_name (GIMP_OBJECT (imagefile)),
gimp_object_get_name (imagefile),
GTK_WIDGET (editor));
}
}
@ -160,7 +160,7 @@ documents_copy_location_cmd_callback (GtkAction *action,
if (imagefile)
gimp_clipboard_set_text (context->gimp,
gimp_object_get_name (GIMP_OBJECT (imagefile)));
gimp_object_get_name (imagefile));
}
void
@ -172,7 +172,7 @@ documents_remove_cmd_callback (GtkAction *action,
GimpImagefile *imagefile = gimp_context_get_imagefile (context);
const gchar *uri;
uri = gimp_object_get_name (GIMP_OBJECT (imagefile));
uri = gimp_object_get_name (imagefile);
gtk_recent_manager_remove_item (gtk_recent_manager_get_default (), uri, NULL);
@ -293,7 +293,7 @@ documents_remove_dangling_foreach (GimpImagefile *imagefile,
if (gimp_thumbnail_peek_image (imagefile->thumbnail) ==
GIMP_THUMB_STATE_NOT_FOUND)
{
const gchar *uri = gimp_object_get_name (GIMP_OBJECT (imagefile));
const gchar *uri = gimp_object_get_name (imagefile);
gtk_recent_manager_remove_item (gtk_recent_manager_get_default (), uri,
NULL);
@ -329,7 +329,7 @@ documents_open_image (GtkWidget *editor,
GimpPDBStatusType status;
GError *error = NULL;
uri = gimp_object_get_name (GIMP_OBJECT (imagefile));
uri = gimp_object_get_name (imagefile);
image = file_open_with_display (context->gimp, context, NULL, uri, FALSE,
&status, &error);
@ -351,7 +351,7 @@ static void
documents_raise_display (GimpDisplay *display,
RaiseClosure *closure)
{
const gchar *uri = gimp_object_get_name (GIMP_OBJECT (display->image));
const gchar *uri = gimp_object_get_name (display->image);
if (uri && ! strcmp (closure->name, uri))
{

6
app/actions/edit-actions.c
View File

@ -291,14 +291,14 @@ edit_actions_update (GimpActionGroup *group,
{
undo_name =
g_strdup_printf (_("_Undo %s"),
gimp_object_get_name (GIMP_OBJECT (undo)));
gimp_object_get_name (undo));
}
if (redo)
{
redo_name =
g_strdup_printf (_("_Redo %s"),
gimp_object_get_name (GIMP_OBJECT (redo)));
gimp_object_get_name (redo));
}
undo = gimp_image_undo_get_fadeable (image);
@ -313,7 +313,7 @@ edit_actions_update (GimpActionGroup *group,
{
fade_name =
g_strdup_printf (_("_Fade %s..."),
gimp_object_get_name (GIMP_OBJECT (undo)));
gimp_object_get_name (undo));
}
}
}

2
app/actions/file-actions.c
View File

@ -346,7 +346,7 @@ file_actions_last_opened_update (GimpContainer *container,
gchar *basename;
gchar *escaped;
uri = gimp_object_get_name (GIMP_OBJECT (imagefile));
uri = gimp_object_get_name (imagefile);
filename = file_utils_uri_display_name (uri);
basename = file_utils_uri_display_basename (uri);

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

@ -225,7 +225,7 @@ file_save_cmd_callback (GtkAction *action,
if (! gimp_image_get_active_drawable (image))
return;
uri = gimp_object_get_name (GIMP_OBJECT (image));
uri = gimp_object_get_name (image);
switch (save_mode)
{
@ -355,7 +355,7 @@ file_revert_cmd_callback (GtkAction *action,
image = display->image;
uri = gimp_object_get_name (GIMP_OBJECT (image));
uri = gimp_object_get_name (image);
if (! uri)
{
@ -491,7 +491,7 @@ file_open_dialog_show (Gimp *gimp,
if (dialog)
{
if (! uri && image)
uri = gimp_object_get_name (GIMP_OBJECT (image));
uri = gimp_object_get_name (image);
if (! uri)
uri = g_object_get_data (G_OBJECT (gimp), GIMP_FILE_OPEN_LAST_URI_KEY);
@ -654,7 +654,7 @@ file_revert_confirm_response (GtkWidget *dialog,
GimpPDBStatusType status;
GError *error = NULL;
uri = gimp_object_get_name (GIMP_OBJECT (old_image));
uri = gimp_object_get_name (old_image);
if (! uri)
uri = g_object_get_data (G_OBJECT (old_image),

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

@ -198,7 +198,7 @@ layers_edit_attributes_cmd_callback (GtkAction *action,
layer,
action_data_get_context (data),
widget,
gimp_object_get_name (GIMP_OBJECT (layer)),
gimp_object_get_name (layer),
layer_fill_type,
_("Layer Attributes"),
"gimp-layer-edit",
@ -1019,7 +1019,7 @@ layers_edit_layer_response (GtkWidget *widget,
new_name = gtk_entry_get_text (GTK_ENTRY (dialog->name_entry));
if (strcmp (new_name, gimp_object_get_name (GIMP_OBJECT (layer))))
if (strcmp (new_name, gimp_object_get_name (layer)))
{
GError *error = NULL;

6
app/actions/plug-in-actions.c
View File

@ -342,7 +342,7 @@ plug_in_actions_register_procedure (GimpPDB *pdb,
{
#if 0
g_print ("%s: %s\n", G_STRFUNC,
gimp_object_get_name (GIMP_OBJECT (procedure)));
gimp_object_get_name (procedure));
#endif
plug_in_actions_add_proc (group, plug_in_proc);
@ -370,7 +370,7 @@ plug_in_actions_unregister_procedure (GimpPDB *pdb,
#if 0
g_print ("%s: %s\n", G_STRFUNC,
gimp_object_get_name (GIMP_OBJECT (procedure)));
gimp_object_get_name (procedure));
#endif
action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
@ -392,7 +392,7 @@ plug_in_actions_menu_path_added (GimpPlugInProcedure *plug_in_proc,
#if 0
g_print ("%s: %s (%s)\n", G_STRFUNC,
gimp_object_get_name (GIMP_OBJECT (plug_in_proc)), menu_path);
gimp_object_get_name (plug_in_proc), menu_path);
#endif
locale_domain = gimp_plug_in_procedure_get_locale_domain (plug_in_proc);

2
app/actions/tool-options-actions.c
View File

@ -200,7 +200,7 @@ tool_options_actions_update_presets (GimpActionGroup *group,
GimpToolOptions *options = list->data;
entry.name = g_strdup_printf ("%s%03d", action_prefix, i);
entry.label = gimp_object_get_name (GIMP_OBJECT (options));
entry.label = gimp_object_get_name (options);
entry.value = i;
gimp_action_group_add_enum_actions (group, NULL, &entry, 1, callback);

2
app/actions/tool-options-commands.c
View File

@ -92,7 +92,7 @@ tool_options_save_to_cmd_callback (GtkAction *action,
if (options)
{
gchar *name = g_strdup (gimp_object_get_name (GIMP_OBJECT (options)));
gchar *name = g_strdup (gimp_object_get_name (options));
gimp_config_sync (G_OBJECT (tool_info->tool_options),
G_OBJECT (options),

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

@ -688,7 +688,7 @@ tools_actions_setup (GimpActionGroup *group)
gchar *name;
stock_id = gimp_viewable_get_stock_id (GIMP_VIEWABLE (tool_info));
identifier = gimp_object_get_name (GIMP_OBJECT (tool_info));
identifier = gimp_object_get_name (tool_info);
tmp = g_strndup (identifier + strlen ("gimp-"),
strlen (identifier) - strlen ("gimp--tool"));

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

@ -134,7 +134,7 @@ vectors_edit_attributes_cmd_callback (GtkAction *action,
options = vectors_options_dialog_new (image, vectors,
action_data_get_context (data),
widget,
gimp_object_get_name (GIMP_OBJECT (vectors)),
gimp_object_get_name (vectors),
_("Path Attributes"),
"gimp-vectors-edit",
GTK_STOCK_EDIT,
@ -686,7 +686,7 @@ vectors_edit_vectors_response (GtkWidget *widget,
new_name = gtk_entry_get_text (GTK_ENTRY (options->name_entry));
if (strcmp (new_name, gimp_object_get_name (GIMP_OBJECT (vectors))))
if (strcmp (new_name, gimp_object_get_name (vectors)))
{
gimp_item_rename (GIMP_ITEM (vectors), new_name, NULL);
gimp_image_flush (options->image);

4
app/actions/windows-actions.c
View File

@ -364,9 +364,9 @@ windows_actions_recent_add (GimpContainer *container,
entry.name = action_name;
entry.stock_id = NULL;
entry.label = gimp_object_get_name (GIMP_OBJECT (info));
entry.label = gimp_object_get_name (info);
entry.accelerator = NULL;
entry.tooltip = gimp_object_get_name (GIMP_OBJECT (info));
entry.tooltip = gimp_object_get_name (info);
entry.callback = G_CALLBACK (windows_open_recent_cmd_callback);
entry.help_id = GIMP_HELP_WINDOWS_OPEN_RECENT_DOCK;

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

@ -362,7 +362,7 @@ gimp_edit_named_cut (GimpImage *image,
gimp_container_add (image->gimp->named_buffers, GIMP_OBJECT (buffer));
g_object_unref (buffer);
return gimp_object_get_name (GIMP_OBJECT (buffer));
return gimp_object_get_name (buffer);
}
return NULL;
@ -393,7 +393,7 @@ gimp_edit_named_copy (GimpImage *image,
gimp_container_add (image->gimp->named_buffers, GIMP_OBJECT (buffer));
g_object_unref (buffer);
return gimp_object_get_name (GIMP_OBJECT (buffer));
return gimp_object_get_name (buffer);
}
return NULL;
@ -421,7 +421,7 @@ gimp_edit_named_copy_visible (GimpImage *image,
gimp_container_add (image->gimp->named_buffers, GIMP_OBJECT (buffer));
g_object_unref (buffer);
return gimp_object_get_name (GIMP_OBJECT (buffer));
return gimp_object_get_name (buffer);
}
return NULL;
@ -523,7 +523,7 @@ gimp_edit_fade (GimpImage *image,
gimp_drawable_apply_region (drawable, &src2PR,
TRUE,
gimp_object_get_name (GIMP_OBJECT (undo)),
gimp_object_get_name (undo),
gimp_context_get_opacity (context),
gimp_context_get_paint_mode (context),
NULL, NULL,

2
app/core/gimpbrushgenerated-save.c
View File

@ -47,7 +47,7 @@ gimp_brush_generated_save (GimpData *data,
GError **error)
{
GimpBrushGenerated *brush = GIMP_BRUSH_GENERATED (data);
const gchar *name = gimp_object_get_name (GIMP_OBJECT (data));
const gchar *name = gimp_object_get_name (data);
FILE *file;
gchar buf[G_ASCII_DTOSTR_BUF_SIZE];
gboolean have_shape = FALSE;

2
app/core/gimpchannel.c
View File

@ -366,7 +366,7 @@ gimp_channel_get_description (GimpViewable *viewable,
gchar **tooltip)
{
if (! strcmp (GIMP_IMAGE_QUICK_MASK_NAME,
gimp_object_get_name (GIMP_OBJECT (viewable))))
gimp_object_get_name (viewable)))
{
return g_strdup (_("Quick Mask"));
}

2
app/core/gimpcontainer.c
View File

@ -363,7 +363,7 @@ gimp_container_serialize_foreach (GObject *object,
gimp_config_writer_open (serialize_data->writer,
g_type_name (G_TYPE_FROM_INSTANCE (object)));
name = gimp_object_get_name (GIMP_OBJECT (object));
name = gimp_object_get_name (object);
if (name)
gimp_config_writer_string (serialize_data->writer, name);

3
app/core/gimpcontext.c
View File

@ -2796,8 +2796,7 @@ gimp_context_get_font_name (GimpContext *context)
{
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
return (context->font ?
gimp_object_get_name (GIMP_OBJECT (context->font)) : NULL);
return (context->font ? gimp_object_get_name (context->font) : NULL);
}
void

4
app/core/gimpdata.c
View File

@ -672,13 +672,13 @@ gimp_data_create_filename (GimpData *data,
if (data->internal)
return;
safename = g_filename_from_utf8 (gimp_object_get_name (GIMP_OBJECT (data)),
safename = g_filename_from_utf8 (gimp_object_get_name (data),
-1, NULL, NULL, &error);
if (! safename)
{
g_warning ("gimp_data_create_filename:\n"
"g_filename_from_utf8() failed for '%s': %s",
gimp_object_get_name (GIMP_OBJECT (data)), error->message);
gimp_object_get_name (data), error->message);
g_error_free (error);
return;
}

6
app/core/gimpdatafactory.c
View File

@ -222,7 +222,7 @@ gimp_data_factory_data_init (GimpDataFactory *factory,
{
if (factory->priv->gimp->be_verbose)
{
const gchar *name = gimp_object_get_name (GIMP_OBJECT (factory));
const gchar *name = gimp_object_get_name (factory);
g_print ("Loading '%s' data\n", name ? name : "???");
}
@ -522,14 +522,12 @@ gimp_data_factory_data_duplicate (GimpDataFactory *factory,
if (new_data)
{
const gchar *name;
const gchar *name = gimp_object_get_name (data);
gchar *ext;
gint copy_len;
gint number;
gchar *new_name;
name = gimp_object_get_name (GIMP_OBJECT (data));
ext = strrchr (name, '#');
copy_len = strlen (_("copy"));

8
app/core/gimpgrouplayer.c
View File

@ -340,7 +340,7 @@ gimp_group_layer_duplicate (GimpItem *item,
new_child = gimp_item_duplicate (child, G_TYPE_FROM_INSTANCE (child));
gimp_object_set_name (GIMP_OBJECT (new_child),
gimp_object_get_name (GIMP_OBJECT (child)));
gimp_object_get_name (child));
mask = gimp_layer_get_mask (GIMP_LAYER (child));
@ -351,7 +351,7 @@ gimp_group_layer_duplicate (GimpItem *item,
new_mask = gimp_layer_get_mask (GIMP_LAYER (new_child));
gimp_object_set_name (GIMP_OBJECT (new_mask),
gimp_object_get_name (GIMP_OBJECT (mask)));
gimp_object_get_name (mask));
}
gimp_viewable_set_parent (GIMP_VIEWABLE (new_child),
@ -889,7 +889,7 @@ gimp_group_layer_stack_update (GimpDrawableStack *stack,
{
#if 0
g_printerr ("%s (%s) %d, %d (%d, %d)\n",
G_STRFUNC, gimp_object_get_name (GIMP_OBJECT (group)),
G_STRFUNC, gimp_object_get_name (group),
x, y, width, height);
#endif
@ -919,7 +919,7 @@ gimp_group_layer_proj_update (GimpProjection *proj,
{
#if 0
g_printerr ("%s (%s) %d, %d (%d, %d)\n",
G_STRFUNC, gimp_object_get_name (GIMP_OBJECT (group)),
G_STRFUNC, gimp_object_get_name (group),
x, y, width, height);
#endif

10
app/core/gimpimage-duplicate.c
View File

@ -178,7 +178,7 @@ gimp_image_duplicate_save_source_uri (GimpImage *image,
GimpImage *new_image)
{
g_object_set_data_full (G_OBJECT (new_image), "gimp-image-source-uri",
g_strdup (gimp_object_get_name (GIMP_OBJECT (image))),
g_strdup (gimp_object_get_name (image)),
(GDestroyNotify) g_free);
}
@ -224,14 +224,14 @@ gimp_image_duplicate_layers (GimpImage *image,
/* Make sure the copied layer doesn't say: "<old layer> copy" */
gimp_object_set_name (GIMP_OBJECT (new_layer),
gimp_object_get_name (GIMP_OBJECT (layer)));
gimp_object_get_name (layer));
/* Make sure that if the layer has a layer mask,
* its name isn't screwed up
*/
if (new_layer->mask)
gimp_object_set_name (GIMP_OBJECT (new_layer->mask),
gimp_object_get_name (GIMP_OBJECT (layer->mask)));
gimp_object_get_name (layer->mask));
if (gimp_image_get_active_layer (image) == layer)
active_layer = new_layer;
@ -273,7 +273,7 @@ gimp_image_duplicate_channels (GimpImage *image,
/* Make sure the copied channel doesn't say: "<old channel> copy" */
gimp_object_set_name (GIMP_OBJECT (new_channel),
gimp_object_get_name (GIMP_OBJECT (channel)));
gimp_object_get_name (channel));
if (gimp_image_get_active_channel (image) == channel)
active_channel = new_channel;
@ -309,7 +309,7 @@ gimp_image_duplicate_vectors (GimpImage *image,
/* Make sure the copied vectors doesn't say: "<old vectors> copy" */
gimp_object_set_name (GIMP_OBJECT (new_vectors),
gimp_object_get_name (GIMP_OBJECT (vectors)));
gimp_object_get_name (vectors));
if (gimp_image_get_active_vectors (image) == vectors)
active_vectors = new_vectors;

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

@ -294,7 +294,7 @@ gimp_image_merge_visible_vectors (GimpImage *image,
cur_item = merge_list;
vectors = GIMP_VECTORS (cur_item->data);
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (vectors)));
name = g_strdup (gimp_object_get_name (vectors));
target_vectors = GIMP_VECTORS (gimp_item_duplicate (GIMP_ITEM (vectors),
GIMP_TYPE_VECTORS));
pos = gimp_item_get_index (GIMP_ITEM (vectors));
@ -455,7 +455,7 @@ gimp_image_merge_layers (GimpImage *image,
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE,
undo_desc);
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (layer)));
name = g_strdup (gimp_object_get_name (layer));
if (merge_type == GIMP_FLATTEN_IMAGE ||
gimp_drawable_type (GIMP_DRAWABLE (layer)) == GIMP_INDEXED_IMAGE)
@ -466,7 +466,7 @@ gimp_image_merge_layers (GimpImage *image,
merge_layer = gimp_layer_new (image, (x2 - x1), (y2 - y1),
type,
gimp_object_get_name (GIMP_OBJECT (layer)),
gimp_object_get_name (layer),
GIMP_OPACITY_OPAQUE, GIMP_NORMAL_MODE);
if (! merge_layer)
{

12
app/core/gimpimage.c
View File

@ -1279,7 +1279,7 @@ gimp_image_channel_add (GimpContainer *container,
GimpImage *image)
{
if (! strcmp (GIMP_IMAGE_QUICK_MASK_NAME,
gimp_object_get_name (GIMP_OBJECT (channel))))
gimp_object_get_name (channel)))
{
gimp_image_set_quick_mask_state (image, TRUE);
}
@ -1291,7 +1291,7 @@ gimp_image_channel_remove (GimpContainer *container,
GimpImage *image)
{
if (! strcmp (GIMP_IMAGE_QUICK_MASK_NAME,
gimp_object_get_name (GIMP_OBJECT (channel))))
gimp_object_get_name (channel)))
{
gimp_image_set_quick_mask_state (image, FALSE);
}
@ -1302,7 +1302,7 @@ gimp_image_channel_name_changed (GimpChannel *channel,
GimpImage *image)
{
if (! strcmp (GIMP_IMAGE_QUICK_MASK_NAME,
gimp_object_get_name (GIMP_OBJECT (channel))))
gimp_object_get_name (channel)))
{
gimp_image_set_quick_mask_state (image, TRUE);
}
@ -1318,7 +1318,7 @@ gimp_image_channel_color_changed (GimpChannel *channel,
GimpImage *image)
{
if (! strcmp (GIMP_IMAGE_QUICK_MASK_NAME,
gimp_object_get_name (GIMP_OBJECT (channel))))
gimp_object_get_name (channel)))
{
image->quick_mask_color = channel->color;
}
@ -1420,7 +1420,7 @@ gimp_image_get_uri (const GimpImage *image)
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
uri = gimp_object_get_name (GIMP_OBJECT (image));
uri = gimp_object_get_name (image);
return uri ? uri : _("Untitled");
}
@ -1451,7 +1451,7 @@ gimp_image_get_filename (const GimpImage *image)
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
uri = gimp_object_get_name (GIMP_OBJECT (image));
uri = gimp_object_get_name (image);
if (! uri)
return NULL;

10
app/core/gimpimagefile.c
View File

@ -242,7 +242,7 @@ gimp_imagefile_create_thumbnail (GimpImagefile *imagefile,
thumbnail = imagefile->thumbnail;
gimp_thumbnail_set_uri (thumbnail,
gimp_object_get_name (GIMP_OBJECT (imagefile)));
gimp_object_get_name (imagefile));
image_state = gimp_thumbnail_peek_image (thumbnail);
@ -334,7 +334,7 @@ gimp_imagefile_create_thumbnail_weak (GimpImagefile *imagefile,
if (size < 1)
return;
uri = gimp_object_get_name (GIMP_OBJECT (imagefile));
uri = gimp_object_get_name (imagefile);
if (! uri)
return;
@ -346,10 +346,10 @@ gimp_imagefile_create_thumbnail_weak (GimpImagefile *imagefile,
if (imagefile)
{
uri = gimp_object_get_name (GIMP_OBJECT (imagefile));
uri = gimp_object_get_name (imagefile);
if (uri &&
strcmp (uri, gimp_object_get_name (GIMP_OBJECT (local))) == 0)
strcmp (uri, gimp_object_get_name (local)) == 0)
{
gimp_imagefile_update (imagefile);
}
@ -459,7 +459,7 @@ gimp_imagefile_get_new_pixbuf (GimpViewable *viewable,
{
GimpImagefile *imagefile = GIMP_IMAGEFILE (viewable);
if (! gimp_object_get_name (GIMP_OBJECT (imagefile)))
if (! gimp_object_get_name (imagefile))
return NULL;
return gimp_imagefile_load_thumb (imagefile, width, height);

4
app/core/gimpimagemapconfig.c
View File

@ -136,8 +136,8 @@ gint
gimp_image_map_config_compare (GimpImageMapConfig *a,
GimpImageMapConfig *b)
{
const gchar *name_a = gimp_object_get_name (GIMP_OBJECT (a));
const gchar *name_b = gimp_object_get_name (GIMP_OBJECT (b));
const gchar *name_a = gimp_object_get_name (a);
const gchar *name_b = gimp_object_get_name (b);
if (a->time > 0 && b->time > 0)
{

4
app/core/gimpitem.c
View File

@ -414,7 +414,7 @@ gimp_item_real_duplicate (GimpItem *item,
gint number;
gint len;
name = gimp_object_get_name (GIMP_OBJECT (item));
name = gimp_object_get_name (item);
g_return_val_if_fail (name != NULL, NULL);
@ -837,7 +837,7 @@ gimp_item_rename (GimpItem *item,
if (! new_name || ! *new_name)
new_name = item_class->default_name;
if (strcmp (new_name, gimp_object_get_name (GIMP_OBJECT (item))))
if (strcmp (new_name, gimp_object_get_name (item)))
return item_class->rename (item, new_name, item_class->rename_desc, error);
return TRUE;

4
app/core/gimpitempropundo.c
View File

@ -110,7 +110,7 @@ gimp_item_prop_undo_constructor (GType type,
switch (GIMP_UNDO (object)->undo_type)
{
case GIMP_UNDO_ITEM_RENAME:
item_prop_undo->name = g_strdup (gimp_object_get_name (GIMP_OBJECT (item)));
item_prop_undo->name = g_strdup (gimp_object_get_name (item));
break;
case GIMP_UNDO_ITEM_DISPLACE:
@ -213,7 +213,7 @@ gimp_item_prop_undo_pop (GimpUndo *undo,
{
gchar *name;
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (item)));
name = g_strdup (gimp_object_get_name (item));
gimp_object_take_name (GIMP_OBJECT (item), item_prop_undo->name);
item_prop_undo->name = name;
}

2
app/core/gimpitemstack.c
View File

@ -229,7 +229,7 @@ gimp_item_stack_get_item_by_name (GimpItemStack *stack,
GimpItem *item = list->data;
GimpContainer *children;
if (! strcmp (gimp_object_get_name (GIMP_OBJECT (item)), name))
if (! strcmp (gimp_object_get_name (item), name))
return item;
children = gimp_viewable_get_children (GIMP_VIEWABLE (item));

4
app/core/gimplayer.c
View File

@ -453,7 +453,7 @@ gimp_layer_get_description (GimpViewable *viewable,
if (gimp_layer_is_floating_sel (GIMP_LAYER (viewable)))
{
return g_strdup_printf (_("Floating Selection\n(%s)"),
gimp_object_get_name (GIMP_OBJECT (viewable)));
gimp_object_get_name (viewable));
}
return GIMP_VIEWABLE_CLASS (parent_class)->get_description (viewable,
@ -1390,7 +1390,7 @@ gimp_layer_create_mask (const GimpLayer *layer,
image = gimp_item_get_image (item);
mask_name = g_strdup_printf (_("%s mask"),
gimp_object_get_name (GIMP_OBJECT (layer)));
gimp_object_get_name (layer));
mask = gimp_layer_mask_new (image,
gimp_item_get_width (item),

3
app/core/gimplayermask.c
View File

@ -231,8 +231,7 @@ gimp_layer_mask_set_layer (GimpLayerMask *layer_mask,
gimp_item_get_offset (GIMP_ITEM (layer), &offset_x, &offset_y);
gimp_item_set_offset (GIMP_ITEM (layer_mask), offset_x, offset_y);
mask_name = g_strdup_printf (_("%s mask"),
gimp_object_get_name (GIMP_OBJECT (layer)));
mask_name = g_strdup_printf (_("%s mask"), gimp_object_get_name (layer));
gimp_object_take_name (GIMP_OBJECT (layer_mask), mask_name);
}

2
app/core/gimptoolinfo.c
View File

@ -324,7 +324,7 @@ gimp_tool_info_build_options_filename (GimpToolInfo *tool_info,
g_return_val_if_fail (GIMP_IS_TOOL_INFO (tool_info), NULL);
name = gimp_object_get_name (GIMP_OBJECT (tool_info));
name = gimp_object_get_name (tool_info);
if (suffix)
basename = g_strconcat (name, suffix, NULL);

3
app/core/gimptoolpresets.c
View File

@ -213,8 +213,7 @@ gimp_tool_presets_new (GimpToolInfo *tool_info)
"policy", GIMP_CONTAINER_POLICY_STRONG,
NULL);
name = g_strdup_printf ("%s options",
gimp_object_get_name (GIMP_OBJECT (tool_info)));
name = g_strdup_printf ("%s options", gimp_object_get_name (tool_info));
gimp_object_take_name (GIMP_OBJECT (presets), name);

2
app/core/gimpviewable.c
View File

@ -374,7 +374,7 @@ static gchar *
gimp_viewable_real_get_description (GimpViewable *viewable,
gchar **tooltip)
{
return g_strdup (gimp_object_get_name (GIMP_OBJECT (viewable)));
return g_strdup (gimp_object_get_name (viewable));
}
static GimpContainer *

3
app/dialogs/fade-dialog.c
View File

@ -107,8 +107,7 @@ fade_dialog_new (GimpImage *image,
"opacity", undo->opacity,
NULL);
title = g_strdup_printf (_("Fade %s"),
gimp_object_get_name (GIMP_OBJECT (undo)));
title = g_strdup_printf (_("Fade %s"), gimp_object_get_name (undo));
dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (drawable),

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

@ -471,7 +471,7 @@ gimp_display_shell_space_pressed (GimpDisplayShell *shell,
return;
shell->space_shaded_tool =
gimp_object_get_name (GIMP_OBJECT (active_tool->tool_info));
gimp_object_get_name (active_tool->tool_info);
gimp_context_set_tool (gimp_get_user_context (gimp),
gimp_get_tool_info (gimp, "gimp-move-tool"));

2
app/display/gimpdisplayshell-close.c
View File

@ -141,7 +141,7 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell,
return;
}
uri = gimp_object_get_name (GIMP_OBJECT (image));
uri = gimp_object_get_name (image);
title = g_strdup_printf (_("Close %s"), gimp_image_get_display_name (image));

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

@ -645,7 +645,7 @@ file_open_convert_items (GimpImage *dest_image,
else
{
gimp_object_set_name (GIMP_OBJECT (item),
gimp_object_get_name (GIMP_OBJECT (src)));
gimp_object_get_name (src));
}
list->data = item;

2
app/file/file-procedure.c
View File

@ -223,7 +223,7 @@ gboolean
file_procedure_in_group (GimpPlugInProcedure *file_proc,
FileProcedureGroup group)
{
const gchar *name = gimp_object_get_name (GIMP_OBJECT (file_proc));
const gchar *name = gimp_object_get_name (file_proc);
gboolean is_xcf_save = FALSE;
gboolean is_filter = FALSE;

2
app/file/file-utils.c
View File

@ -451,7 +451,7 @@ file_utils_save_thumbnail (GimpImage *image,
g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
g_return_val_if_fail (filename != NULL, FALSE);
image_uri = gimp_object_get_name (GIMP_OBJECT (image));
image_uri = gimp_object_get_name (image);
if (image_uri)
{

10
app/menus/plug-in-menus.c
View File

@ -222,7 +222,7 @@ plug_in_menus_register_procedure (GimpPDB *pdb,
GIMP_LOG (MENUS, "register procedure: %s",
gimp_object_get_name (GIMP_OBJECT (procedure)));
gimp_object_get_name (procedure));
for (list = plug_in_proc->menu_paths; list; list = g_list_next (list))
plug_in_menus_menu_path_added (plug_in_proc, list->data, manager);
@ -249,7 +249,7 @@ plug_in_menus_unregister_procedure (GimpPDB *pdb,
GList *list;
GIMP_LOG (MENUS, "unregister procedure: %s",
gimp_object_get_name (GIMP_OBJECT (procedure)));
gimp_object_get_name (procedure));
for (list = plug_in_proc->menu_paths; list; list = g_list_next (list))
{
@ -281,7 +281,7 @@ plug_in_menus_menu_path_added (GimpPlugInProcedure *plug_in_proc,
GimpUIManager *manager)
{
GIMP_LOG (MENUS, "menu path added: %s (%s)",
gimp_object_get_name (GIMP_OBJECT (plug_in_proc)), menu_path);
gimp_object_get_name (plug_in_proc), menu_path);
if (g_str_has_prefix (menu_path, manager->name))
{
@ -446,9 +446,7 @@ plug_in_menus_tree_insert (GTree *entries,
/* Append the procedure name to the menu path in order to get a unique
* key even if two procedures are installed to the same menu entry.
*/
key = g_strconcat (strip,
gimp_object_get_name (GIMP_OBJECT (entry->proc)),
NULL);
key = g_strconcat (strip, gimp_object_get_name (entry->proc), NULL);
g_tree_insert (entries, g_utf8_collate_key (key, -1), entry);

6
app/pdb/brush-cmds.c
View File

@ -59,7 +59,7 @@ brush_new_invoker (GimpProcedure *procedure,
GimpData *data = gimp_data_factory_data_new (gimp->brush_factory, name);
if (data)
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (data)));
actual_name = g_strdup (gimp_object_get_name (data));
else
success = FALSE;
}
@ -99,7 +99,7 @@ brush_duplicate_invoker (GimpProcedure *procedure,
GIMP_DATA (brush));
if (brush_copy)
copy_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (brush_copy)));
copy_name = g_strdup (gimp_object_get_name (brush_copy));
else
success = FALSE;
}
@ -174,7 +174,7 @@ brush_rename_invoker (GimpProcedure *procedure,
if (brush)
{
gimp_object_set_name (GIMP_OBJECT (brush), new_name);
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (brush)));
actual_name = g_strdup (gimp_object_get_name (brush));
}
else
success = FALSE;

4
app/pdb/brushes-cmds.c
View File

@ -105,7 +105,7 @@ brushes_get_brush_invoker (GimpProcedure *procedure,
if (brush)
{
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (brush)));
name = g_strdup (gimp_object_get_name (brush));
width = brush->mask->width;
height = brush->mask->height;
spacing = gimp_brush_get_spacing (brush);
@ -210,7 +210,7 @@ brushes_get_brush_data_invoker (GimpProcedure *procedure,
if (brush)
{
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (brush)));
actual_name = g_strdup (gimp_object_get_name (brush));
opacity = 1.0;
spacing = gimp_brush_get_spacing (brush);
paint_mode = 0;

2
app/pdb/buffer-cmds.c
View File

@ -95,7 +95,7 @@ buffer_rename_invoker (GimpProcedure *procedure,
if (buffer)
{
gimp_object_set_name (GIMP_OBJECT (buffer), new_name);
real_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (buffer)));
real_name = g_strdup (gimp_object_get_name (buffer));
}
else
success = FALSE;

12
app/pdb/context-cmds.c
View File

@ -118,7 +118,7 @@ context_get_paint_method_invoker (GimpProcedure *procedure,
GimpPaintInfo *paint_info = gimp_context_get_paint_info (context);
if (paint_info)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (paint_info)));
name = g_strdup (gimp_object_get_name (paint_info));
else
success = FALSE;
@ -367,7 +367,7 @@ context_get_brush_invoker (GimpProcedure *procedure,
GimpBrush *brush = gimp_context_get_brush (context);
if (brush)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (brush)));
name = g_strdup (gimp_object_get_name (brush));
else
success = FALSE;
@ -422,7 +422,7 @@ context_get_pattern_invoker (GimpProcedure *procedure,
GimpPattern *pattern = gimp_context_get_pattern (context);
if (pattern)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (pattern)));
name = g_strdup (gimp_object_get_name (pattern));
else
success = FALSE;
@ -477,7 +477,7 @@ context_get_gradient_invoker (GimpProcedure *procedure,
GimpGradient *gradient = gimp_context_get_gradient (context);
if (gradient)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (gradient)));
name = g_strdup (gimp_object_get_name (gradient));
else
success = FALSE;
@ -532,7 +532,7 @@ context_get_palette_invoker (GimpProcedure *procedure,
GimpPalette *palette = gimp_context_get_palette (context);
if (palette)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (palette)));
name = g_strdup (gimp_object_get_name (palette));
else
success = FALSE;
@ -587,7 +587,7 @@ context_get_font_invoker (GimpProcedure *procedure,
GimpFont *font = gimp_context_get_font (context);
if (font)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (font)));
name = g_strdup (gimp_object_get_name (font));
else
success = FALSE;

2
app/pdb/drawable-cmds.c
View File

@ -582,7 +582,7 @@ drawable_get_name_invoker (GimpProcedure *procedure,
if (success)
{
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (drawable)));
name = g_strdup (gimp_object_get_name (drawable));
}
return_vals = gimp_procedure_get_return_values (procedure, success,

12
app/pdb/gimppdb-utils.c
View File

@ -315,7 +315,7 @@ gimp_pdb_item_is_attached (GimpItem *item,
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
_("Item '%s' (%d) can not be used because it has not "
"been added to an image"),
gimp_object_get_name (GIMP_OBJECT (item)),
gimp_object_get_name (item),
gimp_item_get_ID (item));
return FALSE;
}
@ -339,7 +339,7 @@ gimp_pdb_item_is_floating (GimpItem *item,
{
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
_("Item '%s' (%d) has already been added to an image"),
gimp_object_get_name (GIMP_OBJECT (item)),
gimp_object_get_name (item),
gimp_item_get_ID (item));
return FALSE;
}
@ -347,7 +347,7 @@ gimp_pdb_item_is_floating (GimpItem *item,
{
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
_("Trying to add item '%s' (%d) to wrong image"),
gimp_object_get_name (GIMP_OBJECT (item)),
gimp_object_get_name (item),
gimp_item_get_ID (item));
return FALSE;
}
@ -367,7 +367,7 @@ gimp_pdb_item_is_writable (GimpItem *item,
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
_("Item '%s' (%d) cannot be modified because its "
"contents are locked"),
gimp_object_get_name (GIMP_OBJECT (item)),
gimp_object_get_name (item),
gimp_item_get_ID (item));
return FALSE;
}
@ -387,7 +387,7 @@ gimp_pdb_item_is_not_group (GimpItem *item,
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
_("Item '%s' (%d) cannot be modified because it "
"is a group item"),
gimp_object_get_name (GIMP_OBJECT (item)),
gimp_object_get_name (item),
gimp_item_get_ID (item));
return FALSE;
}
@ -408,7 +408,7 @@ gimp_pdb_layer_is_text_layer (GimpLayer *layer,
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
_("Layer '%s' (%d) can not be used because it is not "
"a text layer"),
gimp_object_get_name (GIMP_OBJECT (layer)),
gimp_object_get_name (layer),
gimp_item_get_ID (GIMP_ITEM (layer)));
return FALSE;

8
app/pdb/gimppdb.c
View File

@ -157,7 +157,7 @@ gimp_pdb_real_register_procedure (GimpPDB *pdb,
const gchar *name;
GList *list;
name = gimp_object_get_name (GIMP_OBJECT (procedure));
name = gimp_object_get_name (procedure);
list = g_hash_table_lookup (pdb->procedures, name);
@ -172,7 +172,7 @@ gimp_pdb_real_unregister_procedure (GimpPDB *pdb,
const gchar *name;
GList *list;
name = gimp_object_get_name (GIMP_OBJECT (procedure));
name = gimp_object_get_name (procedure);
list = g_hash_table_lookup (pdb->procedures, name);
@ -182,7 +182,7 @@ gimp_pdb_real_unregister_procedure (GimpPDB *pdb,
if (list)
{
name = gimp_object_get_name (GIMP_OBJECT (list->data));
name = gimp_object_get_name (list->data);
g_hash_table_replace (pdb->procedures, (gpointer) name, list);
}
else
@ -410,7 +410,7 @@ gimp_pdb_execute_procedure_by_name (GimpPDB *pdb,
_("Procedure '%s' has been called with a "
"wrong type for argument #%d. "
"Expected %s, got %s."),
gimp_object_get_name (GIMP_OBJECT (procedure)),
gimp_object_get_name (procedure),
i + 1, expected, got);
return_vals = gimp_procedure_get_return_values (procedure,

20
app/pdb/gimpprocedure.c
View File

@ -363,7 +363,7 @@ gimp_procedure_execute (GimpProcedure *procedure,
pdb_error = g_error_new (GIMP_PDB_ERROR, GIMP_PDB_INVALID_RETURN_VALUE,
_("Procedure '%s' returned no return values"),
gimp_object_get_name (GIMP_OBJECT (procedure)));
gimp_object_get_name (procedure));
return_vals = gimp_procedure_get_return_values (procedure, FALSE,
pdb_error);
@ -554,7 +554,7 @@ gimp_procedure_create_override (GimpProcedure *procedure,
int i = 0;
new_procedure = gimp_procedure_new (new_marshal_func);
name = gimp_object_get_name (GIMP_OBJECT (procedure));
name = gimp_object_get_name (procedure);
gimp_object_set_static_name (GIMP_OBJECT (new_procedure), name);
@ -621,7 +621,7 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
_("Procedure '%s' returned a wrong value type "
"for return value '%s' (#%d). "
"Expected %s, got %s."),
gimp_object_get_name (GIMP_OBJECT (procedure)),
gimp_object_get_name (procedure),
g_param_spec_get_name (pspec),
i + 1, g_type_name (spec_type),
g_type_name (arg_type));
@ -633,7 +633,7 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
_("Procedure '%s' has been called with a "
"wrong value type for argument '%s' (#%d). "
"Expected %s, got %s."),
gimp_object_get_name (GIMP_OBJECT (procedure)),
gimp_object_get_name (procedure),
g_param_spec_get_name (pspec),
i + 1, g_type_name (spec_type),
g_type_name (arg_type));
@ -667,7 +667,7 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
"Most likely a plug-in is trying "
"to work on a layer that doesn't "
"exist any longer."),
gimp_object_get_name (GIMP_OBJECT (procedure)),
gimp_object_get_name (procedure),
g_param_spec_get_name (pspec));
}
else
@ -679,7 +679,7 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
"Most likely a plug-in is trying "
"to work on a layer that doesn't "
"exist any longer."),
gimp_object_get_name (GIMP_OBJECT (procedure)),
gimp_object_get_name (procedure),
g_param_spec_get_name (pspec));
}
}
@ -695,7 +695,7 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
"Most likely a plug-in is trying "
"to work on an image that doesn't "
"exist any longer."),
gimp_object_get_name (GIMP_OBJECT (procedure)),
gimp_object_get_name (procedure),
g_param_spec_get_name (pspec));
}
else
@ -707,7 +707,7 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
"Most likely a plug-in is trying "
"to work on an image that doesn't "
"exist any longer."),
gimp_object_get_name (GIMP_OBJECT (procedure)),
gimp_object_get_name (procedure),
g_param_spec_get_name (pspec));
}
}
@ -726,7 +726,7 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
"'%s' as return value '%s' "
"(#%d, type %s). "
"This value is out of range."),
gimp_object_get_name (GIMP_OBJECT (procedure)),
gimp_object_get_name (procedure),
value,
g_param_spec_get_name (pspec),
i + 1, g_type_name (spec_type));
@ -739,7 +739,7 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
"value '%s' for argument '%s' "
"(#%d, type %s). "
"This value is out of range."),
gimp_object_get_name (GIMP_OBJECT (procedure)),
gimp_object_get_name (procedure),
value,
g_param_spec_get_name (pspec),
i + 1, g_type_name (spec_type));

6
app/pdb/gradient-cmds.c
View File

@ -108,7 +108,7 @@ gradient_new_invoker (GimpProcedure *procedure,
GimpData *data = gimp_data_factory_data_new (gimp->gradient_factory, name);
if (data)
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (data)));
actual_name = g_strdup (gimp_object_get_name (data));
else
success = FALSE;
}
@ -148,7 +148,7 @@ gradient_duplicate_invoker (GimpProcedure *procedure,
GIMP_DATA (gradient));
if (gradient_copy)
copy_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (gradient_copy)));
copy_name = g_strdup (gimp_object_get_name (gradient_copy));
else
success = FALSE;
}
@ -223,7 +223,7 @@ gradient_rename_invoker (GimpProcedure *procedure,
if (gradient)
{
gimp_object_set_name (GIMP_OBJECT (gradient), new_name);
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (gradient)));
actual_name = g_strdup (gimp_object_get_name (gradient));
}
else
success = FALSE;

2
app/pdb/gradients-cmds.c
View File

@ -248,7 +248,7 @@ gradients_get_gradient_data_invoker (GimpProcedure *procedure,
pos = 0.0;
delta = 1.0 / (sample_size - 1);
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (gradient)));
actual_name = g_strdup (gimp_object_get_name (gradient));
grad_data = g_new (gdouble, sample_size * 4);
width = sample_size * 4;

2
app/pdb/image-cmds.c
View File

@ -2201,7 +2201,7 @@ image_get_uri_invoker (GimpProcedure *procedure,
if (success)
{
uri = g_strdup (gimp_object_get_name (GIMP_OBJECT (image)));
uri = g_strdup (gimp_object_get_name (image));
}
return_vals = gimp_procedure_get_return_values (procedure, success,

6
app/pdb/palette-cmds.c
View File

@ -59,7 +59,7 @@ palette_new_invoker (GimpProcedure *procedure,
GimpData *data = gimp_data_factory_data_new (gimp->palette_factory, name);
if (data)
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (data)));
actual_name = g_strdup (gimp_object_get_name (data));
else
success = FALSE;
}
@ -99,7 +99,7 @@ palette_duplicate_invoker (GimpProcedure *procedure,
GIMP_DATA (palette));
if (palette_copy)
copy_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (palette_copy)));
copy_name = g_strdup (gimp_object_get_name (palette_copy));
else
success = FALSE;
}
@ -140,7 +140,7 @@ palette_rename_invoker (GimpProcedure *procedure,
if (palette)
{
gimp_object_set_name (GIMP_OBJECT (palette), new_name);
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (palette)));
actual_name = g_strdup (gimp_object_get_name (palette));
}
else
success = FALSE;

4
app/pdb/palettes-cmds.c
View File

@ -104,7 +104,7 @@ palettes_get_palette_invoker (GimpProcedure *procedure,
if (palette)
{
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (palette)));
name = g_strdup (gimp_object_get_name (palette));
num_colors = palette->n_colors;
}
else
@ -156,7 +156,7 @@ palettes_get_palette_entry_invoker (GimpProcedure *procedure,
{
GimpPaletteEntry *entry = g_list_nth_data (palette->colors, entry_num);
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (palette)));
actual_name = g_strdup (gimp_object_get_name (palette));
num_colors = palette->n_colors;
color = entry->color;
}

4
app/pdb/paths-cmds.c
View File

@ -99,7 +99,7 @@ path_get_current_invoker (GimpProcedure *procedure,
GimpVectors *vectors = gimp_image_get_active_vectors (image);
if (vectors)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (vectors)));
name = g_strdup (gimp_object_get_name (vectors));
else
success = FALSE;
}
@ -529,7 +529,7 @@ get_path_by_tattoo_invoker (GimpProcedure *procedure,
GimpVectors *vectors = gimp_image_get_vectors_by_tattoo (image, tattoo);
if (vectors)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (vectors)));
name = g_strdup (gimp_object_get_name (vectors));
else
success = FALSE;
}

4
app/pdb/patterns-cmds.c
View File

@ -104,7 +104,7 @@ patterns_get_pattern_invoker (GimpProcedure *procedure,
if (pattern)
{
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (pattern)));
name = g_strdup (gimp_object_get_name (pattern));
width = pattern->mask->width;
height = pattern->mask->height;
}
@ -155,7 +155,7 @@ patterns_get_pattern_data_invoker (GimpProcedure *procedure,
if (pattern)
{
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (pattern)));
actual_name = g_strdup (gimp_object_get_name (pattern));
width = pattern->mask->width;
height = pattern->mask->height;
mask_bpp = pattern->mask->bytes;

2
app/pdb/vectors-cmds.c
View File

@ -225,7 +225,7 @@ vectors_get_name_invoker (GimpProcedure *procedure,
if (success)
{
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (vectors)));
name = g_strdup (gimp_object_get_name (vectors));
}
return_vals = gimp_procedure_get_return_values (procedure, success,

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

@ -339,7 +339,7 @@ gimp_plug_in_cleanup_item (GimpPlugInProcFrame *proc_frame,
GIMP_LOG (SHADOW_TILES,
"Freeing shadow tiles of drawable '%s' on behalf of '%s'.",
gimp_object_get_name (GIMP_OBJECT (item)),
gimp_object_get_name (item),
gimp_plug_in_procedure_get_label (GIMP_PLUG_IN_PROCEDURE (proc)));
gimp_drawable_free_shadow_tiles (GIMP_DRAWABLE (item));

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

@ -95,7 +95,7 @@ gimp_plug_in_handle_message (GimpPlugIn *plug_in,
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"sent a CONFIG message. This should not happen.",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog));
gimp_plug_in_close (plug_in, TRUE);
break;
@ -108,7 +108,7 @@ gimp_plug_in_handle_message (GimpPlugIn *plug_in,
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"sent a TILE_ACK message. This should not happen.",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog));
gimp_plug_in_close (plug_in, TRUE);
break;
@ -117,7 +117,7 @@ gimp_plug_in_handle_message (GimpPlugIn *plug_in,
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"sent a TILE_DATA message. This should not happen.",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog));
gimp_plug_in_close (plug_in, TRUE);
break;
@ -134,7 +134,7 @@ gimp_plug_in_handle_message (GimpPlugIn *plug_in,
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"sent a TEMP_PROC_RUN message. This should not happen.",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog));
gimp_plug_in_close (plug_in, TRUE);
break;
@ -236,7 +236,7 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"tried writing to invalid drawable %d (killing)",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog),
tile_info->drawable_ID);
gimp_plug_in_close (plug_in, TRUE);
@ -248,7 +248,7 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
"Plug-In \"%s\"\n(%s)\n\n"
"tried writing to drawable %d which was removed "
"from the image (killing)",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog),
tile_info->drawable_ID);
gimp_plug_in_close (plug_in, TRUE);
@ -273,7 +273,7 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"requested invalid tile (killing)",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog));
gimp_plug_in_close (plug_in, TRUE);
return;
@ -318,7 +318,7 @@ gimp_plug_in_handle_tile_get (GimpPlugIn *plug_in,
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"tried reading from invalid drawable %d (killing)",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog),
request->drawable_ID);
gimp_plug_in_close (plug_in, TRUE);
@ -330,7 +330,7 @@ gimp_plug_in_handle_tile_get (GimpPlugIn *plug_in,
"Plug-In \"%s\"\n(%s)\n\n"
"tried reading from drawable %d which was removed "
"from the image (killing)",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog),
request->drawable_ID);
gimp_plug_in_close (plug_in, TRUE);
@ -355,7 +355,7 @@ gimp_plug_in_handle_tile_get (GimpPlugIn *plug_in,
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"requested invalid tile (killing)",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog));
gimp_plug_in_close (plug_in, TRUE);
return;
@ -478,7 +478,7 @@ gimp_plug_in_handle_proc_run (GimpPlugIn *plug_in,
"Plug-In \"%s\"\n(%s)\n"
"called deprecated procedure '%s'.\n"
"It should call '%s' instead!",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog),
canonical, proc_name);
}
@ -493,7 +493,7 @@ gimp_plug_in_handle_proc_run (GimpPlugIn *plug_in,
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_WARNING,
"Plug-In \"%s\"\n(%s)\n"
"called deprecated procedure '%s'.",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog),
canonical);
}
@ -503,7 +503,7 @@ gimp_plug_in_handle_proc_run (GimpPlugIn *plug_in,
"WARNING: Plug-In \"%s\"\n(%s)\n"
"called deprecated procedure '%s'.\n"
"It should call '%s' instead!",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog),
canonical, procedure->deprecated);
}
@ -621,7 +621,7 @@ gimp_plug_in_handle_temp_proc_return (GimpPlugIn *plug_in,
"Plug-In \"%s\"\n(%s)\n\n"
"sent a TEMP_PROC_RETURN message while not running "
"a temporary procedure. This should not happen.",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog));
gimp_plug_in_close (plug_in, TRUE);
}
@ -660,7 +660,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn *plug_in,
"attempted to install procedure \"%s\" "
"which fails to comply with the array parameter "
"passing standard. Argument %d is noncompliant.",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog),
canonical, i);
g_free (canonical);
@ -719,7 +719,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn *plug_in,
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"attempted to install a procedure NULL parameter name.",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog));
g_free (canonical);
return;
@ -730,7 +730,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn *plug_in,
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"attempted to install a procedure with invalid UTF-8 strings.",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog));
g_free (canonical);
return;
@ -864,7 +864,7 @@ gimp_plug_in_handle_extension_ack (GimpPlugIn *plug_in)
"Plug-In \"%s\"\n(%s)\n\n"
"sent an EXTENSION_ACK message while not being started "
"as an extension. This should not happen.",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog));
gimp_plug_in_close (plug_in, TRUE);
}
@ -883,7 +883,7 @@ gimp_plug_in_handle_has_init (GimpPlugIn *plug_in)
"Plug-In \"%s\"\n(%s)\n\n"
"sent an HAS_INIT message while not in query(). "
"This should not happen.",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog));
gimp_plug_in_close (plug_in, TRUE);
}

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

@ -245,7 +245,7 @@ gimp_plug_in_open (GimpPlugIn *plug_in,
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Unable to run plug-in \"%s\"\n(%s)\n\npipe() failed: %s",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog),
g_strerror (errno));
return FALSE;
@ -366,7 +366,7 @@ gimp_plug_in_open (GimpPlugIn *plug_in,
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Unable to run plug-in \"%s\"\n(%s)\n\n%s",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog),
error->message);
g_error_free (error);
@ -539,7 +539,7 @@ gimp_plug_in_close (GimpPlugIn *plug_in,
#ifdef GIMP_UNSTABLE
g_printerr ("plug-in '%s' aborted before sending its "
"temporary procedure return values\n",
gimp_object_get_name (GIMP_OBJECT (plug_in)));
gimp_object_get_name (plug_in));
#endif
if (proc_frame->main_loop &&
@ -555,7 +555,7 @@ gimp_plug_in_close (GimpPlugIn *plug_in,
#ifdef GIMP_UNSTABLE
g_printerr ("plug-in '%s' aborted before sending its "
"procedure return values\n",
gimp_object_get_name (GIMP_OBJECT (plug_in)));
gimp_object_get_name (plug_in));
#endif
g_main_loop_quit (plug_in->main_proc_frame.main_loop);
@ -567,7 +567,7 @@ gimp_plug_in_close (GimpPlugIn *plug_in,
#ifdef GIMP_UNSTABLE
g_printerr ("extension '%s' aborted before sending its "
"extension_ack message\n",
gimp_object_get_name (GIMP_OBJECT (plug_in)));
gimp_object_get_name (plug_in));
#endif
g_main_loop_quit (plug_in->ext_main_loop);
@ -639,7 +639,7 @@ gimp_plug_in_recv_message (GIOChannel *channel,
"The dying plug-in may have messed up GIMP's internal "
"state. You may want to save your images and restart "
"GIMP to be on the safe side."),
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog));
}
@ -859,7 +859,7 @@ gimp_plug_in_get_undo_desc (GimpPlugIn *plug_in)
undo_desc = gimp_plug_in_procedure_get_label (proc);
}
return undo_desc ? undo_desc : gimp_object_get_name (GIMP_OBJECT (plug_in));
return undo_desc ? undo_desc : gimp_object_get_name (plug_in);
}
/* called from the PDB (gimp_plugin_menu_register) */
@ -890,7 +890,7 @@ gimp_plug_in_menu_register (GimpPlugIn *plug_in,
"for the procedure \"%s\".\n"
"It has however not installed that procedure. This "
"is not allowed.",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog),
menu_path, proc_name);
@ -922,7 +922,7 @@ gimp_plug_in_menu_register (GimpPlugIn *plug_in,
"already contained a path. To make this work, "
"pass just the menu's label to "
"gimp_install_procedure().",
gimp_object_get_name (GIMP_OBJECT (plug_in)),
gimp_object_get_name (plug_in),
gimp_filename_to_utf8 (plug_in->prog),
menu_path, proc_name);

6
app/plug-in/gimppluginmanager-call.c
View File

@ -166,7 +166,7 @@ gimp_plug_in_manager_call_run (GimpPlugInManager *manager,
if (! gimp_plug_in_open (plug_in, GIMP_PLUG_IN_CALL_RUN, FALSE))
{
const gchar *name = gimp_object_get_name (GIMP_OBJECT (plug_in));
const gchar *name = gimp_object_get_name (plug_in);
GError *error = g_error_new (GIMP_PLUG_IN_ERROR,
GIMP_PLUG_IN_EXECUTION_FAILED,
_("Failed to run plug-in \"%s\""),
@ -216,7 +216,7 @@ gimp_plug_in_manager_call_run (GimpPlugInManager *manager,
! gp_proc_run_write (plug_in->my_write, &proc_run, plug_in) ||
! gimp_wire_flush (plug_in->my_write, plug_in))
{
const gchar *name = gimp_object_get_name (GIMP_OBJECT (plug_in));
const gchar *name = gimp_object_get_name (plug_in);
GError *error = g_error_new (GIMP_PLUG_IN_ERROR,
GIMP_PLUG_IN_EXECUTION_FAILED,
_("Failed to run plug-in \"%s\""),
@ -314,7 +314,7 @@ gimp_plug_in_manager_call_run_temp (GimpPlugInManager *manager,
if (! gp_temp_proc_run_write (plug_in->my_write, &proc_run, plug_in) ||
! gimp_wire_flush (plug_in->my_write, plug_in))
{
const gchar *name = gimp_object_get_name (GIMP_OBJECT (plug_in));
const gchar *name = gimp_object_get_name (plug_in);
GError *error = g_error_new (GIMP_PLUG_IN_ERROR,
GIMP_PLUG_IN_EXECUTION_FAILED,
_("Failed to run plug-in \"%s\""),

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

@ -826,7 +826,7 @@ gimp_plug_in_procedure_set_image_types (GimpPlugInProcedure *proc,
g_free (proc->image_types);
proc->image_types = g_strdup (image_types);
proc->image_types_val = image_types_parse (gimp_object_get_name (GIMP_OBJECT (proc)),
proc->image_types_val = image_types_parse (gimp_object_get_name (proc),
proc->image_types);
}

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

@ -206,7 +206,7 @@ gimp_plug_in_proc_frame_get_return_values (GimpPlugInProcFrame *proc_frame)
error = g_error_new (GIMP_PDB_ERROR, GIMP_PDB_INVALID_RETURN_VALUE,
_("Procedure '%s' returned no return values"),
gimp_object_get_name (GIMP_OBJECT (procedure)));
gimp_object_get_name (procedure));
return_vals = gimp_procedure_get_return_values (procedure, FALSE,
error);

4
app/text/gimpfont.c
View File

@ -201,7 +201,7 @@ gimp_font_get_popup_size (GimpViewable *viewable,
if (! font->pango_context)
return FALSE;
name = gimp_object_get_name (GIMP_OBJECT (font));
name = gimp_object_get_name (font);
font_desc = pango_font_description_from_string (name);
g_return_val_if_fail (font_desc != NULL, FALSE);
@ -257,7 +257,7 @@ gimp_font_get_new_preview (GimpViewable *viewable,
PangoFontDescription *font_desc;
const gchar *name;
name = gimp_object_get_name (GIMP_OBJECT (font));
name = gimp_object_get_name (font);
DEBUGPRINT (("%s: ", name));

4
app/text/gimptextlayer-xcf.c
View File

@ -77,7 +77,7 @@ gimp_text_layer_xcf_load_hack (GimpLayer **layer)
"Some text properties may be wrong. "
"Unless you want to edit the text layer, "
"you don't need to worry about this."),
gimp_object_get_name (GIMP_OBJECT (*layer)),
gimp_object_get_name (*layer),
error->message);
g_clear_error (&error);
}
@ -189,7 +189,7 @@ gimp_text_layer_from_layer (GimpLayer *layer,
drawable = GIMP_DRAWABLE (text_layer);
gimp_object_set_name (GIMP_OBJECT (text_layer),
gimp_object_get_name (GIMP_OBJECT (layer)));
gimp_object_get_name (layer));
item->ID = gimp_item_get_ID (GIMP_ITEM (layer));

2
app/vectors/gimpvectors-export.c
View File

@ -209,7 +209,7 @@ static void
gimp_vectors_export_path (const GimpVectors *vectors,
GString *str)
{
const gchar *name = gimp_object_get_name (GIMP_OBJECT (vectors));
const gchar *name = gimp_object_get_name (vectors);
gchar *data = gimp_vectors_export_path_data (vectors);
gchar *esc_name;

8
app/widgets/gimpcontainerentry.c
View File

@ -216,7 +216,7 @@ gimp_container_entry_set (GimpContainerEntry *entry,
GIMP_CONTAINER_ENTRY_COLUMN_RENDERER,
renderer,
GIMP_CONTAINER_ENTRY_COLUMN_NAME,
gimp_object_get_name (GIMP_OBJECT (viewable)),
gimp_object_get_name (viewable),
-1);
g_object_unref (renderer);
@ -343,7 +343,7 @@ gimp_container_entry_rename_item (GimpContainerView *view,
if (iter)
gtk_list_store_set (GTK_LIST_STORE (model), iter,
GIMP_CONTAINER_ENTRY_COLUMN_NAME,
gimp_object_get_name (GIMP_OBJECT (viewable)),
gimp_object_get_name (viewable),
-1);
}
@ -359,9 +359,7 @@ gimp_container_entry_select_item (GimpContainerView *view,
gimp_container_entry_changed,
view);
gtk_entry_set_text (entry,
iter ?
gimp_object_get_name (GIMP_OBJECT (viewable)) : "");
gtk_entry_set_text (entry, iter ? gimp_object_get_name (viewable) : "");
g_signal_handlers_unblock_by_func (entry,
gimp_container_entry_changed,

3
app/widgets/gimpcontainertreeview.c
View File

@ -1146,8 +1146,7 @@ gimp_container_tree_view_button_press (GtkWidget *widget,
{
const gchar *real_name;
real_name =
gimp_object_get_name (GIMP_OBJECT (renderer->viewable));
real_name = gimp_object_get_name (renderer->viewable);
gtk_tree_store_set (GTK_TREE_STORE (tree_view->model),
&iter,

2
app/widgets/gimpcontrollerlist.c
View File

@ -565,7 +565,7 @@ gimp_controller_list_remove_clicked (GtkWidget *button,
RESPONSE_DISABLE,
-1);
name = gimp_object_get_name (GIMP_OBJECT (list->dest_info));
name = gimp_object_get_name (list->dest_info);
gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
_("Remove Controller '%s'?"), name);

8
app/widgets/gimpdataeditor.c
View File

@ -422,7 +422,7 @@ gimp_data_editor_get_aux_info (GimpDocked *docked)
{
const gchar *value;
value = gimp_object_get_name (GIMP_OBJECT (editor->data));
value = gimp_object_get_name (editor->data);
aux = gimp_session_info_aux_new (AUX_INFO_CURRENT_DATA, value);
aux_info = g_list_append (aux_info, aux);
@ -469,7 +469,7 @@ gimp_data_editor_real_set_data (GimpDataEditor *editor,
editor);
gtk_entry_set_text (GTK_ENTRY (editor->name_entry),
gimp_object_get_name (GIMP_OBJECT (editor->data)));
gimp_object_get_name (editor->data));
}
else
{
@ -569,7 +569,7 @@ gimp_data_editor_name_key_press (GtkWidget *widget,
if (kevent->keyval == GDK_Escape)
{
gtk_entry_set_text (GTK_ENTRY (editor->name_entry),
gimp_object_get_name (GIMP_OBJECT (editor->data)));
gimp_object_get_name (editor->data));
return TRUE;
}
@ -594,7 +594,7 @@ gimp_data_editor_name_activate (GtkWidget *widget,
else
{
gtk_entry_set_text (GTK_ENTRY (widget),
gimp_object_get_name (GIMP_OBJECT (editor->data)));
gimp_object_get_name (editor->data));
g_free (new_name);
}
}

4
app/widgets/gimpdevicestatus.c
View File

@ -254,10 +254,10 @@ gimp_device_status_device_add (GimpContainer *devices,
/* the device name */
if (device_info->display == gdk_display_get_default ())
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (device_info)));
name = g_strdup (gimp_object_get_name (device_info));
else
name = g_strdup_printf ("%s (%s)",
gimp_object_get_name (GIMP_OBJECT (device_info)),
gimp_object_get_name (device_info),
gdk_display_get_name (device_info->display));
entry->label = gtk_label_new (name);

2
app/widgets/gimpdialogfactory.c
View File

@ -1411,7 +1411,7 @@ gimp_dialog_factories_save_foreach (gconstpointer key,
gimp_config_writer_open (writer, "session-info");
gimp_config_writer_string (writer,
gimp_object_get_name (GIMP_OBJECT (factory)));
gimp_object_get_name (factory));
gimp_config_writer_string (writer,
info->toplevel_entry ?
info->toplevel_entry->identifier :

2
app/widgets/gimpdocumentview.c
View File

@ -168,7 +168,7 @@ gimp_document_view_drag_uri_list (GtkWidget *widget,
if (viewable)
{
const gchar *uri = gimp_object_get_name (GIMP_OBJECT (viewable));
const gchar *uri = gimp_object_get_name (viewable);
return g_list_append (NULL, g_strdup (uri));
}

10
app/widgets/gimpfiledialog.c
View File

@ -522,7 +522,7 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
GIMP_FILE_SAVE_A_COPY_URI_KEY);
if (! dir_uri)
dir_uri = gimp_object_get_name (GIMP_OBJECT (image));
dir_uri = gimp_object_get_name (image);
if (! dir_uri)
dir_uri = g_object_get_data (G_OBJECT (image),
@ -554,7 +554,7 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
GIMP_FILE_SAVE_A_COPY_URI_KEY);
if (! name_uri)
name_uri = gimp_object_get_name (GIMP_OBJECT (image));
name_uri = gimp_object_get_name (image);
if (! name_uri)
name_uri = g_object_get_data (G_OBJECT (image),
@ -573,7 +573,7 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
* 1. Type of last Save
* 2. .xcf (which we don't explicitly append)
*/
ext_uri = gimp_object_get_name (GIMP_OBJECT (image));
ext_uri = gimp_object_get_name (image);
if (! ext_uri)
ext_uri = "file:///we/only/care/about/extension.xcf";
@ -607,7 +607,7 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
GIMP_FILE_IMPORT_SOURCE_URI_KEY);
if (! dir_uri)
dir_uri = gimp_object_get_name (GIMP_OBJECT (image));
dir_uri = gimp_object_get_name (image);
if (! dir_uri)
dir_uri = g_object_get_data (G_OBJECT (gimp),
@ -637,7 +637,7 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
GIMP_FILE_EXPORT_TO_URI_KEY);
if (! name_uri)
name_uri = gimp_object_get_name (GIMP_OBJECT (image));
name_uri = gimp_object_get_name (image);
if (! name_uri)
name_uri = gimp_image_get_uri (image); /* Untitled */

2
app/widgets/gimphistogrameditor.c
View File

@ -500,7 +500,7 @@ gimp_histogram_editor_name_update (GimpHistogramEditor *editor)
const gchar *name = NULL;
if (editor->drawable)
name = gimp_object_get_name (GIMP_OBJECT (editor->drawable));
name = gimp_object_get_name (editor->drawable);
gimp_editor_set_name (GIMP_EDITOR (editor), name);
}

2
app/widgets/gimpimagepropview.c
View File

@ -319,7 +319,7 @@ static void
gimp_image_prop_view_label_set_filename (GtkWidget *label,
GimpImage *image)
{
const gchar *uri = gimp_object_get_name (GIMP_OBJECT (image));
const gchar *uri = gimp_object_get_name (image);
if (uri)
{

2
app/widgets/gimpitemtreeview.c
View File

@ -1132,7 +1132,7 @@ gimp_item_tree_view_name_edited (GtkCellRendererText *cell,
item = GIMP_ITEM (renderer->viewable);
old_name = gimp_object_get_name (GIMP_OBJECT (item));
old_name = gimp_object_get_name (item);
if (! old_name) old_name = "";
if (! new_name) new_name = "";

2
app/widgets/gimpthumbbox.c
View File

@ -716,7 +716,7 @@ gimp_thumb_box_auto_thumbnail (GimpThumbBox *box)
{
Gimp *gimp = box->imagefile->gimp;
GimpThumbnail *thumb = box->imagefile->thumbnail;
const gchar *uri = gimp_object_get_name (GIMP_OBJECT (box->imagefile));
const gchar *uri = gimp_object_get_name (box->imagefile);
box->idle_id = 0;

2
app/widgets/gimptoolbox-dnd.c
View File

@ -216,7 +216,7 @@ gimp_toolbox_drop_drawable (GtkWidget *widget,
new_image, new_type));
gimp_object_set_name (GIMP_OBJECT (new_layer),
gimp_object_get_name (GIMP_OBJECT (drawable)));
gimp_object_get_name (drawable));
gimp_item_get_offset (GIMP_ITEM (new_layer), &off_x, &off_y);
gimp_item_translate (GIMP_ITEM (new_layer), -off_x, -off_y, FALSE);

2
app/widgets/gimptoolbox.c
View File

@ -726,7 +726,7 @@ toolbox_create_tools (GimpToolbox *toolbox,
gchar *tmp;
gchar *name;
identifier = gimp_object_get_name (GIMP_OBJECT (tool_info));
identifier = gimp_object_get_name (tool_info);
tmp = g_strndup (identifier + strlen ("gimp-"),
strlen (identifier) - strlen ("gimp--tool"));

2
app/widgets/gimpviewrenderergradient.c
View File

@ -74,7 +74,7 @@ gimp_view_renderer_gradient_fg_bg_changed (GimpContext *context,
{
#if 0
g_printerr ("%s: invalidating %s\n", G_STRFUNC,
gimp_object_get_name (GIMP_OBJECT (renderer->viewable)));
gimp_object_get_name (renderer->viewable));
#endif
gimp_view_renderer_invalidate (renderer);

4
app/widgets/gimpviewrendererimagefile.c
View File

@ -160,7 +160,7 @@ gimp_view_renderer_imagefile_get_icon (GimpImagefile *imagefile,
GtkIconTheme *icon_theme = gtk_icon_theme_get_for_screen (screen);
GdkPixbuf *pixbuf = NULL;
if (! gimp_object_get_name (GIMP_OBJECT (imagefile)))
if (! gimp_object_get_name (imagefile))
return NULL;
if (! pixbuf)
@ -169,7 +169,7 @@ gimp_view_renderer_imagefile_get_icon (GimpImagefile *imagefile,
GFileInfo *file_info;
GtkIconInfo *info;
file = g_file_new_for_uri (gimp_object_get_name (GIMP_OBJECT (imagefile)));
file = g_file_new_for_uri (gimp_object_get_name (imagefile));
file_info = g_file_query_info (file, "standard::icon", 0, NULL, NULL);
if (file_info)

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

@ -1147,7 +1147,7 @@ xcf_save_layer (XcfInfo *info,
xcf_write_int32_check_error (info, &value, 1);
/* write out the layers name */
string = gimp_object_get_name (GIMP_OBJECT (layer));
string = gimp_object_get_name (layer);
xcf_write_string_check_error (info, (gchar **) &string, 1);
/* write out the layer properties */
@ -1221,7 +1221,7 @@ xcf_save_channel (XcfInfo *info,
xcf_write_int32_check_error (info, &value, 1);
/* write out the channels name */
string = gimp_object_get_name (GIMP_OBJECT (channel));
string = gimp_object_get_name (channel);
xcf_write_string_check_error (info, (gchar **) &string, 1);
/* write out the channel properties */
@ -1696,7 +1696,7 @@ xcf_save_old_paths (XcfInfo *info,
* we already saved the number of paths and I wont start seeking
* around to fix that cruft */
name = (gchar *) gimp_object_get_name (GIMP_OBJECT (vectors));
name = (gchar *) gimp_object_get_name (vectors);
locked = gimp_item_get_linked (GIMP_ITEM (vectors));
state = closed ? 4 : 2; /* EDIT : ADD (editing state, 1.2 compat) */
version = 3;
@ -1798,7 +1798,7 @@ xcf_save_vectors (XcfInfo *info,
parasites = GIMP_ITEM (vectors)->parasites;
name = gimp_object_get_name (GIMP_OBJECT (vectors));
name = gimp_object_get_name (vectors);
visible = gimp_item_get_visible (GIMP_ITEM (vectors));
linked = gimp_item_get_linked (GIMP_ITEM (vectors));
tattoo = gimp_item_get_tattoo (GIMP_ITEM (vectors));

6
tools/pdbgen/pdb/brush.pdb
View File

@ -38,7 +38,7 @@ sub brush_new {
GimpData *data = gimp_data_factory_data_new (gimp->brush_factory, name);
if (data)
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (data)));
actual_name = g_strdup (gimp_object_get_name (data));
else
success = FALSE;
}
@ -74,7 +74,7 @@ sub brush_duplicate {
GIMP_DATA (brush));
if (brush_copy)
copy_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (brush_copy)));
copy_name = g_strdup (gimp_object_get_name (brush_copy));
else
success = FALSE;
}
@ -171,7 +171,7 @@ sub brush_rename {
if (brush)
{
gimp_object_set_name (GIMP_OBJECT (brush), new_name);
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (brush)));
actual_name = g_strdup (gimp_object_get_name (brush));
}
else
success = FALSE;

4
tools/pdbgen/pdb/brushes.pdb
View File

@ -90,7 +90,7 @@ sub brushes_get_brush {
if (brush)
{
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (brush)));
name = g_strdup (gimp_object_get_name (brush));
width = brush->mask->width;
height = brush->mask->height;
spacing = gimp_brush_get_spacing (brush);
@ -180,7 +180,7 @@ sub brushes_get_brush_data {
if (brush)
{
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (brush)));
actual_name = g_strdup (gimp_object_get_name (brush));
opacity = 1.0;
spacing = gimp_brush_get_spacing (brush);
paint_mode = 0;

2
tools/pdbgen/pdb/buffer.pdb
View File

@ -73,7 +73,7 @@ sub buffer_rename {
if (buffer)
{
gimp_object_set_name (GIMP_OBJECT (buffer), new_name);
real_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (buffer)));
real_name = g_strdup (gimp_object_get_name (buffer));
}
else
success = FALSE;

12
tools/pdbgen/pdb/context.pdb
View File

@ -93,7 +93,7 @@ HELP
GimpPaintInfo *paint_info = gimp_context_get_paint_info (context);
if (paint_info)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (paint_info)));
name = g_strdup (gimp_object_get_name (paint_info));
else
success = FALSE;
}
@ -423,7 +423,7 @@ HELP
GimpBrush *brush = gimp_context_get_brush (context);
if (brush)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (brush)));
name = g_strdup (gimp_object_get_name (brush));
else
success = FALSE;
}
@ -485,7 +485,7 @@ HELP
GimpPattern *pattern = gimp_context_get_pattern (context);
if (pattern)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (pattern)));
name = g_strdup (gimp_object_get_name (pattern));
else
success = FALSE;
}
@ -545,7 +545,7 @@ HELP
GimpGradient *gradient = gimp_context_get_gradient (context);
if (gradient)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (gradient)));
name = g_strdup (gimp_object_get_name (gradient));
else
success = FALSE;
}
@ -605,7 +605,7 @@ HELP
GimpPalette *palette = gimp_context_get_palette (context);
if (palette)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (palette)));
name = g_strdup (gimp_object_get_name (palette));
else
success = FALSE;
}
@ -665,7 +665,7 @@ HELP
GimpFont *font = gimp_context_get_font (context);
if (font)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (font)));
name = g_strdup (gimp_object_get_name (font));
else
success = FALSE;
}

2
tools/pdbgen/pdb/drawable.pdb
View File

@ -738,7 +738,7 @@ sub drawable_get_name {
%invoke = (
code => <<'CODE'
{
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (drawable)));
name = g_strdup (gimp_object_get_name (drawable));
}
CODE
);

6
tools/pdbgen/pdb/gradient.pdb
View File

@ -36,7 +36,7 @@ sub gradient_new {
GimpData *data = gimp_data_factory_data_new (gimp->gradient_factory, name);
if (data)
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (data)));
actual_name = g_strdup (gimp_object_get_name (data));
else
success = FALSE;
}
@ -72,7 +72,7 @@ sub gradient_duplicate {
GIMP_DATA (gradient));
if (gradient_copy)
copy_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (gradient_copy)));
copy_name = g_strdup (gimp_object_get_name (gradient_copy));
else
success = FALSE;
}
@ -139,7 +139,7 @@ sub gradient_rename {
if (gradient)
{
gimp_object_set_name (GIMP_OBJECT (gradient), new_name);
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (gradient)));
actual_name = g_strdup (gimp_object_get_name (gradient));
}
else
success = FALSE;

2
tools/pdbgen/pdb/gradients.pdb
View File

@ -218,7 +218,7 @@ sub gradients_get_gradient_data {
pos = 0.0;
delta = 1.0 / (sample_size - 1);
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (gradient)));
actual_name = g_strdup (gimp_object_get_name (gradient));
grad_data = g_new (gdouble, sample_size * 4);
width = sample_size * 4;

2
tools/pdbgen/pdb/image.pdb
View File

@ -2247,7 +2247,7 @@ HELP
%invoke = (
code => <<'CODE'
{
uri = g_strdup (gimp_object_get_name (GIMP_OBJECT (image)));
uri = g_strdup (gimp_object_get_name (image));
}
CODE
);

6
tools/pdbgen/pdb/palette.pdb
View File

@ -38,7 +38,7 @@ sub palette_new {
GimpData *data = gimp_data_factory_data_new (gimp->palette_factory, name);
if (data)
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (data)));
actual_name = g_strdup (gimp_object_get_name (data));
else
success = FALSE;
}
@ -104,7 +104,7 @@ sub palette_duplicate {
GIMP_DATA (palette));
if (palette_copy)
copy_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (palette_copy)));
copy_name = g_strdup (gimp_object_get_name (palette_copy));
else
success = FALSE;
}
@ -141,7 +141,7 @@ sub palette_rename {
if (palette)
{
gimp_object_set_name (GIMP_OBJECT (palette), new_name);
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (palette)));
actual_name = g_strdup (gimp_object_get_name (palette));
}
else
success = FALSE;

4
tools/pdbgen/pdb/palettes.pdb
View File

@ -85,7 +85,7 @@ sub palettes_get_palette {
if (palette)
{
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (palette)));
name = g_strdup (gimp_object_get_name (palette));
num_colors = palette->n_colors;
}
else
@ -130,7 +130,7 @@ sub palettes_get_palette_entry {
{
GimpPaletteEntry *entry = g_list_nth_data (palette->colors, entry_num);
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (palette)));
actual_name = g_strdup (gimp_object_get_name (palette));
num_colors = palette->n_colors;
color = entry->color;
}

4
tools/pdbgen/pdb/paths.pdb
View File

@ -133,7 +133,7 @@ sub path_get_current {
GimpVectors *vectors = gimp_image_get_active_vectors (image);
if (vectors)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (vectors)));
name = g_strdup (gimp_object_get_name (vectors));
else
success = FALSE;
}
@ -441,7 +441,7 @@ sub get_path_by_tattoo {
GimpVectors *vectors = gimp_image_get_vectors_by_tattoo (image, tattoo);
if (vectors)
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (vectors)));
name = g_strdup (gimp_object_get_name (vectors));
else
success = FALSE;
}

4
tools/pdbgen/pdb/patterns.pdb
View File

@ -87,7 +87,7 @@ sub patterns_get_pattern {
if (pattern)
{
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (pattern)));
name = g_strdup (gimp_object_get_name (pattern));
width = pattern->mask->width;
height = pattern->mask->height;
}
@ -133,7 +133,7 @@ sub patterns_get_pattern_data {
if (pattern)
{
actual_name = g_strdup (gimp_object_get_name (GIMP_OBJECT (pattern)));
actual_name = g_strdup (gimp_object_get_name (pattern));
width = pattern->mask->width;
height = pattern->mask->height;
mask_bpp = pattern->mask->bytes;

2
tools/pdbgen/pdb/vectors.pdb
View File

@ -200,7 +200,7 @@ sub vectors_get_name {
%invoke = (
code => <<"CODE"
{
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (vectors)));
name = g_strdup (gimp_object_get_name (vectors));
}
CODE
);