Commit d31e1fbe authored by cedlemo's avatar cedlemo Committed by Matthias Clasen

GtkImage: Make resource property work properly

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
parent 342db272
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment