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

GtkImage: Make resource property work properly

Browse Source 
gtk_image_set_from_resource was setting the resource_path,
only to have it overwritten again before returning. That
is not as it should be, so change things to set the resource
path late.

https://bugzilla.gnome.org/show_bug.cgi?id=751443
This commit is contained in:
cedlemo 2015-06-24 13:59:00 +00:00 committed by Matthias Clasen
parent 342db27278
commit d31e1fbef0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkimage.c
View File

@ -1015,8 +1015,6 @@ gtk_image_set_from_resource (GtkImage *image,
return;
}
priv->resource_path = g_strdup (resource_path);
if (gdk_pixbuf_animation_is_static_image (animation))
gtk_image_set_from_pixbuf (image, gdk_pixbuf_animation_get_static_image (animation));
else
@ -1024,6 +1022,8 @@ gtk_image_set_from_resource (GtkImage *image,
_gtk_icon_helper_set_pixbuf_scale (priv->icon_helper, scale_factor);
priv->resource_path = g_strdup (resource_path);
g_object_notify (G_OBJECT (image), "resource");
g_object_unref (animation);