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

Proposed by Neil J. Patel on 2011-08-16
Status: Merged
Approved by: Gord Allott on 2011-08-16
Approved revision: 1373
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) 2011-08-16 Approve on 2011-08-16
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.
Gord Allott (gordallott) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/SimpleLauncherIcon.cpp'
2--- plugins/unityshell/src/SimpleLauncherIcon.cpp 2011-08-12 04:04:15 +0000
3+++ plugins/unityshell/src/SimpleLauncherIcon.cpp 2011-08-16 10:09:24 +0000
4@@ -124,14 +124,9 @@
5
6 void SimpleLauncherIcon::OnIconThemeChanged(GtkIconTheme* icon_theme, gpointer data)
7 {
8- SimpleLauncherIcon* self;
9-
10- if (!data)
11- return;
12+ SimpleLauncherIcon* self = static_cast<SimpleLauncherIcon*>(data);
13
14 // invalidate the current cache
15- _current_theme_is_mono = -1;
16-
17- self = (SimpleLauncherIcon*) data;
18+ self->_current_theme_is_mono = -1;
19 self->ReloadIcon();
20 }