Merge lp:~marcobiscaro2112/unity/fixes-605475.2 into lp:unity

[Marco Biscaro]

[Mirco Müller (macslow)]

Marco, looks mostly fine. But add a sanity check (test against NULL) for data in OnIconThemeChanged() so we won't crash if - for whatever reason - "this" might turn out to be NULL.

review: Needs Fixing

[Marco Biscaro (marcobiscaro2112)]

I think it's fixed now, Mirco. Could you review it again?

[Mirco Müller (macslow)]

Approved.

review: Approve

=== modified file 'src/SimpleLauncherIcon.cpp'
--- src/SimpleLauncherIcon.cpp	2011-02-22 16:13:43 +0000
+++ src/SimpleLauncherIcon.cpp	2011-03-22 11:10:53 +0000
@@ -35,6 +35,9 @@
   LauncherIcon::MouseClick.connect (sigc::mem_fun (this, &SimpleLauncherIcon::OnMouseClick));
   LauncherIcon::MouseEnter.connect (sigc::mem_fun (this, &SimpleLauncherIcon::OnMouseEnter));
   LauncherIcon::MouseLeave.connect (sigc::mem_fun (this, &SimpleLauncherIcon::OnMouseLeave));
+
+  g_signal_connect (gtk_icon_theme_get_default (), "changed",
+                    G_CALLBACK (SimpleLauncherIcon::OnIconThemeChanged), this);
 }
 
 SimpleLauncherIcon::~SimpleLauncherIcon()
@@ -110,3 +113,24 @@
   
   needs_redraw.emit (this);
 }
+
+void
+SimpleLauncherIcon::OnIconThemeChanged (GtkIconTheme* icon_theme, gpointer data)
+{
+  SimpleLauncherIcon *self;
+
+  if (!data) return;
+
+  self = (SimpleLauncherIcon*) data;
+  
+  /*
+   * Unreference the previous icon and redraw
+   * (forcing the new icon to be loaded)
+   */
+  if (self->m_Icon)
+  {
+    self->m_Icon->UnReference ();
+    self->m_Icon = 0;
+  }
+  self->needs_redraw.emit (self);
+}

=== modified file 'src/SimpleLauncherIcon.h'
--- src/SimpleLauncherIcon.h	2011-02-22 16:13:43 +0000
+++ src/SimpleLauncherIcon.h	2011-03-22 11:10:53 +0000
@@ -47,7 +47,8 @@
     char *m_IconName;
     nux::BaseTexture *m_Icon;
     void ActivateLauncherIcon ();
+    static void OnIconThemeChanged (GtkIconTheme* icon_theme, gpointer data);
 };
 
-#endif // BAMFLAUNCHERICON_H
+#endif // SIMPLELAUNCHERICON_H