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

Proposed by Neil J. Patel
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 1373
Proposed branch: lp:~njpatel/unity/fix-741652
Merge into: lp:unity
Diff against target: 20 lines (+2/-7)
1 file modified
plugins/unityshell/src/SimpleLauncherIcon.cpp (+2/-7)
To merge this branch: bzr merge lp:~njpatel/unity/fix-741652
Reviewer Review Type Date Requested Status
Gord Allott (community) Approve
Review via email: mp+71656@code.launchpad.net

Description of the change

Fixes usage of member variable in static method.

To post a comment you must log in.
Revision history for this message
Gord Allott (gordallott) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
124124
125void SimpleLauncherIcon::OnIconThemeChanged(GtkIconTheme* icon_theme, gpointer data)125void SimpleLauncherIcon::OnIconThemeChanged(GtkIconTheme* icon_theme, gpointer data)
126{126{
127 SimpleLauncherIcon* self;127 SimpleLauncherIcon* self = static_cast<SimpleLauncherIcon*>(data);
128
129 if (!data)
130 return;
131128
132 // invalidate the current cache129 // invalidate the current cache
133 _current_theme_is_mono = -1;130 self->_current_theme_is_mono = -1;
134
135 self = (SimpleLauncherIcon*) data;
136 self->ReloadIcon();131 self->ReloadIcon();
137}132}