[gtk+] GtkImage: Simplify _set_from_icon_name
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkImage: Simplify _set_from_icon_name
- Date: Sat, 2 Jan 2016 14:52:48 +0000 (UTC)
commit 3758762119827a62c93bd071dd6a7e63723d5e10
Author: Timm Bäder <mail baedert org>
Date: Wed Dec 30 15:45:07 2015 +0100
GtkImage: Simplify _set_from_icon_name
We don't need to strdup icon_name since that will happen in
_gtk_icon_helper_set_icon_name anyway.
gtk/gtkimage.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index f9bd7e1..4ac0931 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1223,7 +1223,6 @@ gtk_image_set_from_icon_name (GtkImage *image,
GtkIconSize size)
{
GtkImagePrivate *priv;
- gchar *new_name;
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));
- new_name = g_strdup (icon_name);
gtk_image_clear (image);
- if (new_name)
- {
- _gtk_icon_helper_set_icon_name (priv->icon_helper, new_name, size);
- g_free (new_name);
- }
+ if (icon_name)
+ _gtk_icon_helper_set_icon_name (priv->icon_helper, icon_name, size);
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_thaw_notify (G_OBJECT (image));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]