Unity

Merge lp:~vanvugt/unity/fix-1064175 into lp:unity

  1. fix-1064175
  2. Merge into trunk
Proposed by Daniel van Vugt on 2012-10-09
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2012-10-09
Approved revision: 2814
Merged at revision: 2814
Proposed branch: lp:~vanvugt/unity/fix-1064175
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/unityshell/src/unityshell.cpp (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/unity/fix-1064175
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve on 2012-10-09
Marco Trevisan (Treviño) 2012-10-09 Approve on 2012-10-09
Review via email: mp+128623@code.launchpad.net

Commit Message

Fix build failure. You can't use "->" with a reference.
(LP: #1064175)

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) :
review: Approve
Łukasz Zemczak (sil2100) wrote :

WFM.

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/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2012-10-05 14:18:40 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2012-10-09 04:01:23 +0000
4@@ -2459,7 +2459,7 @@
5 }
6 }
7
8- if (WindowManager::Default()->IsScaleActive() && ScaleScreen::get(screen)->getSelectedWindow() == window->id())
9+ if (WindowManager::Default().IsScaleActive() && ScaleScreen::get(screen)->getSelectedWindow() == window->id())
10 {
11 nux::Geometry scaled_geo = GetScaledGeometry();
12 int inside_glow = scale::decoration::RADIUS/4;