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

GtkImage: Simplify _set_from_icon_name

Browse Source 
We don't need to strdup icon_name since that will happen in
_gtk_icon_helper_set_icon_name anyway.
This commit is contained in:
Timm Bäder 2015-12-30 15:45:07 +01:00
parent 9704f46b38
commit 3758762119
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkimage.c
View File

@ -1223,7 +1223,6 @@ gtk_image_set_from_icon_name (GtkImage *image,
GtkIconSize size) GtkIconSize size)
{ {
GtkImagePrivate *priv; GtkImagePrivate *priv;
gchar *new_name;
g_return_if_fail (GTK_IS_IMAGE (image)); g_return_if_fail (GTK_IS_IMAGE (image));
@ -1231,18 +1230,14 @@ gtk_image_set_from_icon_name (GtkImage *image,
g_object_freeze_notify (G_OBJECT (image)); g_object_freeze_notify (G_OBJECT (image));
new_name = g_strdup (icon_name);
gtk_image_clear (image); gtk_image_clear (image);
if (new_name) if (icon_name)
{ _gtk_icon_helper_set_icon_name (priv->icon_helper, icon_name, size);
_gtk_icon_helper_set_icon_name (priv->icon_helper, new_name, size);
g_free (new_name);
}
g_object_notify_by_pspec (G_OBJECT (image), image_props[PROP_ICON_NAME]); g_object_notify_by_pspec (G_OBJECT (image), image_props[PROP_ICON_NAME]);
g_object_notify_by_pspec (G_OBJECT (image), image_props[PROP_ICON_SIZE]); g_object_notify_by_pspec (G_OBJECT (image), image_props[PROP_ICON_SIZE]);
g_object_thaw_notify (G_OBJECT (image)); g_object_thaw_notify (G_OBJECT (image));
} }