AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

builder: Allow named objects to be used in paintable/pixbuf properties

Browse Source 
Instead of erroring if an object by a name already exists, use that
object.
This commit is contained in:
Benjamin Otte 2018-03-22 22:03:47 +01:00
parent 4fc072925c
commit ea0290c50e
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gtk/gtkbuilder.c
View File

@ -2057,16 +2057,27 @@ gtk_builder_value_from_string_type (GtkBuilder *builder,
gchar *filename;
GError *tmp_error = NULL;
GdkPixbuf *pixbuf = NULL;
GObject *object;
if (g_hash_table_contains (builder->priv->objects, string))
object = g_hash_table_lookup (builder->priv->objects, string);
if (object)
{
g_set_error (error,
GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_INVALID_VALUE,
"Could not load image '%s': "
" '%s' is already used as object id",
string, string);
return FALSE;
if (g_type_is_a (G_OBJECT_TYPE (object), G_VALUE_TYPE (value)))
{
g_value_set_object (value, object);
return TRUE;
}
else
{
g_set_error (error,
GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_INVALID_VALUE,
"Could not load image '%s': "
" '%s' is already used as object id for a %s",
string, string, G_OBJECT_TYPE_NAME (object));
return FALSE;
}
}
filename = _gtk_builder_get_resource_path (builder, string);