Unity

Merge lp:~unity-team/unity/unity.fix-931483 into lp:unity

  1. unity.fix-931483
  2. Merge into trunk
Proposed by Tim Penhey
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 1974
Proposed branch: lp:~unity-team/unity/unity.fix-931483
Merge into: lp:unity
Prerequisite: lp:~unity-team/unity/unity.fix-932318
Diff against target: 12 lines (+2/-0)
1 file modified
plugins/unityshell/src/Launcher.cpp (+2/-0)
To merge this branch: bzr merge lp:~unity-team/unity/unity.fix-931483
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Needs Information
Tim Penhey (community) Approve
Review via email: mp+93107@code.launchpad.net

This proposal supersedes a proposal from 2012-02-15.

Description of the change

Redraw pips, UNBLOCK

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) :
review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Lambda's don't get disconnected when the object is destroyed (unless we do that manually). Are we sure that this won't lead to a crash when a launcher is removed and the viewport switch happens?

review: Needs Information

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/Launcher.cpp'
2--- plugins/unityshell/src/Launcher.cpp 2012-02-13 22:43:18 +0000
3+++ plugins/unityshell/src/Launcher.cpp 2012-02-15 00:25:23 +0000
4@@ -188,6 +188,8 @@
5 plugin_adapter.terminate_spread.connect(sigc::mem_fun(this, &Launcher::OnPluginStateChanged));
6 plugin_adapter.terminate_expo.connect(sigc::mem_fun(this, &Launcher::OnPluginStateChanged));
7
8+ plugin_adapter.compiz_screen_viewport_switch_ended.connect([&]() { EnsureAnimation(); });
9+
10 GeisAdapter& adapter = *(GeisAdapter::Default());
11 adapter.drag_start.connect(sigc::mem_fun(this, &Launcher::OnDragStart));
12 adapter.drag_update.connect(sigc::mem_fun(this, &Launcher::OnDragUpdate));