Merge lp:~njpatel/unity/fix-741652 into lp:unity

[Neil J. Patel]

Fixes usage of member variable in static method.

[Gord Allott (gordallott)]

+1

review: Approve

=== modified file 'plugins/unityshell/src/SimpleLauncherIcon.cpp'
--- plugins/unityshell/src/SimpleLauncherIcon.cpp	2011-08-12 04:04:15 +0000
+++ plugins/unityshell/src/SimpleLauncherIcon.cpp	2011-08-16 10:09:24 +0000
@@ -124,14 +124,9 @@
 
 void SimpleLauncherIcon::OnIconThemeChanged(GtkIconTheme* icon_theme, gpointer data)
 {
-  SimpleLauncherIcon* self;
-
-  if (!data)
-    return;
+  SimpleLauncherIcon* self = static_cast<SimpleLauncherIcon*>(data);
 
   // invalidate the current cache
-  _current_theme_is_mono = -1;
-
-  self = (SimpleLauncherIcon*) data;
+  self->_current_theme_is_mono = -1;
   self->ReloadIcon();
 }