Merge lp:~didrocks/unity/fix683444 into lp:unity

[Didier Roche]

Fix bug of unknown icon when the desktop file is setting a custom one (absolute
path)

[Jason Smith (jassmith)]

+1 approved

review: Approve

[lp:~didrocks/unity/fix683444]

653. By Didier Roche on 2010-12-02

free the gerror(s)

=== modified file 'src/LauncherIcon.cpp'
--- src/LauncherIcon.cpp	2010-12-02 16:01:38 +0000
+++ src/LauncherIcon.cpp	2010-12-02 16:21:46 +0000
@@ -223,6 +223,7 @@
     g_warning ("Unable to load '%s' from icon theme: %s",
                icon_name,
                error ? error->message : "unknown");
+    g_error_free (error);
 
     if (g_strcmp0 (icon_name, "folder") == 0)
       return NULL;
@@ -233,6 +234,38 @@
   return result;
 }
 
+nux::BaseTexture * LauncherIcon::TextureFromPath (const char *icon_name, int size)
+{
+
+  GdkPixbuf *pbuf;
+  nux::BaseTexture *result;
+  GError *error = NULL;
+  
+  if (!icon_name)
+    return TextureFromGtkTheme (DEFAULT_ICON, size);
+  
+  pbuf = gdk_pixbuf_new_from_file_at_size (icon_name, size, size, &error);
+
+  if (GDK_IS_PIXBUF (pbuf))
+  {
+    result = nux::CreateTextureFromPixbuf (pbuf); 
+    ColorForIcon (pbuf, _background_color, _glow_color);
+  
+    g_object_unref (pbuf);
+  }
+  else
+  {
+    g_warning ("Unable to load '%s' icon: %s",
+               icon_name,
+               error->message : "unknown");
+    g_error_free (error);
+
+    return TextureFromGtkTheme (DEFAULT_ICON, size);
+  }
+  
+  return result;
+}
+
 void LauncherIcon::SetTooltipText(const TCHAR* text)
 {
     m_TooltipText = text;

=== modified file 'src/LauncherIcon.h'
--- src/LauncherIcon.h	2010-12-02 15:56:08 +0000
+++ src/LauncherIcon.h	2010-12-02 16:21:46 +0000
@@ -143,6 +143,7 @@
     virtual bool IconOwnsWindow (Window w) { return false; }
 
     nux::BaseTexture * TextureFromGtkTheme (const char *name, int size);
+    nux::BaseTexture * TextureFromPath     (const char *name, int size);
 
     nux::NString m_TooltipText;
     //! the window this icon belong too.

=== modified file 'src/SimpleLauncherIcon.cpp'
--- src/SimpleLauncherIcon.cpp	2010-11-24 18:59:55 +0000
+++ src/SimpleLauncherIcon.cpp	2010-12-02 16:21:46 +0000
@@ -78,7 +78,10 @@
     if (!m_IconName)
       return 0;
     
-    m_Icon = TextureFromGtkTheme (m_IconName, size);
+    if (g_str_has_prefix (m_IconName, "/"))
+        m_Icon = TextureFromPath (m_IconName, size);
+    else
+        m_Icon = TextureFromGtkTheme (m_IconName, size);
     return m_Icon;
 }