Unity

Merge lp:~manuel-nicetto/unity/bug-750781 into lp:unity

  1. bug-750781
  2. Merge into trunk
Proposed by Manuel Nicetto
Status: Merged
Approved by: Alex Launi
Approved revision: no longer in the source branch.
Merged at revision: 1256
Proposed branch: lp:~manuel-nicetto/unity/bug-750781
Merge into: lp:unity
Diff against target: 20 lines (+2/-2)
1 file modified
src/Launcher.cpp (+2/-2)
To merge this branch: bzr merge lp:~manuel-nicetto/unity/bug-750781
Reviewer Review Type Date Requested Status
Alex Launi (community) Approve
Mirco Müller Pending
Review via email: mp+64086@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alex Launi (alexlauni) wrote :

Looks good, but before it can be merged we need you to sign the Canonical Contributor Agreement. Details and instructions for signing the document can be found at http://www.canonical.com/contributors.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp 2011-06-09 17:07:15 +0000
+++ src/Launcher.cpp 2011-06-09 21:09:40 +0000
@@ -785,7 +785,7 @@
785 QueueDraw ();785 QueueDraw ();
786 ubus_server_send_message (ubus_server_get_default (),786 ubus_server_send_message (ubus_server_get_default (),
787 UBUS_LAUNCHER_END_KEY_NAV,787 UBUS_LAUNCHER_END_KEY_NAV,
788 NULL);788 g_variant_new_boolean (true));
789 selection_change.emit ();789 selection_change.emit ();
790}790}
791791
@@ -3341,7 +3341,7 @@
3341 if (it != (LauncherModel::iterator)NULL)3341 if (it != (LauncherModel::iterator)NULL)
3342 {3342 {
3343 if ((*it)->OpenQuicklist (true))3343 if ((*it)->OpenQuicklist (true))
3344 leaveKeyNavMode (true);3344 leaveKeyNavMode (false);
3345 }3345 }
3346 break;3346 break;
33473347