Merge lp:~attente/unity/hud-controller-gvariant-type-error into lp:unity

Proposed by William Hua
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3643
Merged at revision: 3644
Proposed branch: lp:~attente/unity/hud-controller-gvariant-type-error
Merge into: lp:unity
Diff against target: 22 lines (+1/-11)
1 file modified
launcher/Launcher.cpp (+1/-11)
To merge this branch: bzr merge lp:~attente/unity/hud-controller-gvariant-type-error
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Christopher Townsend Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+204893@code.launchpad.net

Commit message

Launcher: Fix GVariant type error in Hud UBus message.

Description of the change

Fix GVariant type error in launcher controller.

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

Oh, nice catch!
But instead of changing things here, why not fixing Launcher::OnLockHideChanged so that it will just be http://pastebin.ubuntu.com/6879011/ ?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
William Hua (attente) wrote :

Ah, thanks, that changes looks much better.

3643. By William Hua

Fix it in launcher instead.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Based on MArco's comments, this LGTM.

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp 2013-12-23 20:56:19 +0000
+++ launcher/Launcher.cpp 2014-02-05 15:49:34 +0000
@@ -919,17 +919,7 @@
919919
920void Launcher::OnLockHideChanged(GVariant *data)920void Launcher::OnLockHideChanged(GVariant *data)
921{921{
922 gboolean enable_lock = FALSE;922 hide_machine_.SetQuirk(LauncherHideMachine::LOCK_HIDE, glib::Variant(data).GetBool());
923 g_variant_get(data, "(b)", &enable_lock);
924
925 if (enable_lock)
926 {
927 hide_machine_.SetQuirk(LauncherHideMachine::LOCK_HIDE, true);
928 }
929 else
930 {
931 hide_machine_.SetQuirk(LauncherHideMachine::LOCK_HIDE, false);
932 }
933}923}
934924
935void Launcher::DesaturateIcons()925void Launcher::DesaturateIcons()