stylecontext: Do invalidation on first resize container

[~andy/gtk] / gtk / gtkiconhelper.c

diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index 10ce2493dee3f6f534aab929cdc6d73f5a7be474..58ae8a15db776402e7195525b871e10672a5192e 100644 (file)
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -263,7 +263,7 @@ ensure_pixbuf_for_icon_name_or_gicon (GtkIconHelper *self,
   self->priv->rendered_pixbuf = ensure_stated_icon_from_info (self, context, info);
 
   if (info)
-    gtk_icon_info_free (info);
+    g_object_unref (info);
 }
 
 static void
@@ -413,7 +413,7 @@ _gtk_icon_helper_set_icon_name (GtkIconHelper *self,
   _gtk_icon_helper_clear (self);
 
   if (icon_name != NULL &&
-      g_strcmp0 (icon_name, "") != 0)
+      icon_name[0] != '\0')
     {
       self->priv->storage_type = GTK_IMAGE_ICON_NAME;
       self->priv->icon_name = g_strdup (icon_name);
@@ -470,7 +470,7 @@ _gtk_icon_helper_set_stock_id (GtkIconHelper *self,
   _gtk_icon_helper_clear (self);
 
   if (stock_id != NULL &&
-      g_strcmp0 (stock_id, "") != 0)
+      stock_id[0] != '\0')
     {
       self->priv->storage_type = GTK_IMAGE_STOCK;
       self->priv->stock_id = g_strdup (stock_id);