Unity

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

  1. unity.fix-632460
  2. Merge into trunk
Proposed by Mirco Müller
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 502
Proposed branch: lp:~unity-team/unity/unity.fix-632460
Merge into: lp:unity
Diff against target: 20 lines (+9/-1)
1 file modified
unity-private/launcher/scroller-controller.vala (+9/-1)
To merge this branch: bzr merge lp:~unity-team/unity/unity.fix-632460
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+35414@code.launchpad.net

Description of the change

The patch-suggestion from Iain Buclaw (https://bugs.edge.launchpad.net/unity/+bug/632460/comments/10) works. So this fixes LP: #632460

Further note: for all special places (Trash, Files&Folders, Workspaces, Favourites) get_controller_for_view(model[index]) returns NULL. Other launchers (normal apps) do work though if invoked via super-key-combo. Added a warning() and FIXME-remark in the code for later.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unity-private/launcher/scroller-controller.vala'
2--- unity-private/launcher/scroller-controller.vala 2010-09-14 13:48:09 +0000
3+++ unity-private/launcher/scroller-controller.vala 2010-09-14 14:50:56 +0000
4@@ -81,7 +81,15 @@
5 Unity.global_shell.super_key_active = false;
6
7 var childcontroller = get_controller_for_view (model[index]);
8- childcontroller.activate ();
9+ if (childcontroller != null)
10+ {
11+ childcontroller.activate ();
12+ }
13+ else
14+ {
15+ // FIXME
16+ warning ("get_controller_for_view() returned NULL\n");
17+ }
18 }
19
20 uint super_key_source = 0;