From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Mon, 4 Mar 2013 20:33:04 +0000 (+0100)
Subject: GtkIconTheme: fix regression from 0db32f0632ef4675bfcfc9ec201f7af157a48ab0
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=9d81b69e06cd9c2ad9cb5204056bfae5a3128e9c;p=~andy%2Fgtk

GtkIconTheme: fix regression from 0db32f0632ef4675bfcfc9ec201f7af157a48ab0

icon_info_dup() is now called also for GtkIconInfos that already have
a pixbuf, so we must make sure that we correctly carry that from
the original icon_info to the copy.
---

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 5d7a2f956..5f8089fa8 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3027,6 +3027,8 @@ icon_info_dup (GtkIconInfo *icon_info)
     dup->icon_file = g_object_ref (icon_info->icon_file);
   if (icon_info->loadable)
     dup->loadable = g_object_ref (icon_info->loadable);
+  if (icon_info->pixbuf)
+    dup->pixbuf = g_object_ref (icon_info->pixbuf);
 
   for (l = icon_info->emblem_infos; l != NULL; l = l->next)
     {
@@ -4906,9 +4908,11 @@ gtk_icon_theme_lookup_by_gicon (GtkIconTheme       *icon_theme,
               if (emblem_info)
                 info->emblem_infos = g_slist_prepend (info->emblem_infos, emblem_info);
             }
-        }
 
-      return info;
+          return info;
+        }
+      else
+        return NULL;
     }
   else if (GDK_IS_PIXBUF (icon))
     {