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

[William Hua]

Launcher: Fix GVariant type error in Hud UBus message.

Fix GVariant type error in launcher controller.

[Marco Trevisan (Treviño) (3v1n0)]

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/ ?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3642
http://jenkins.qa.ubuntu.com/job/unity-ci/596/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/130

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/596/rebuild

review: Approve (continuous-integration)

[William Hua (attente)]

Ah, thanks, that changes looks much better.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3643
http://jenkins.qa.ubuntu.com/job/unity-ci/600/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/134

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/600/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Based on MArco's comments, this LGTM.

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== 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 @@
 
 void Launcher::OnLockHideChanged(GVariant *data)
 {
-  gboolean enable_lock = FALSE;
-  g_variant_get(data, "(b)", &enable_lock);
-
-  if (enable_lock)
-  {
-    hide_machine_.SetQuirk(LauncherHideMachine::LOCK_HIDE, true);
-  }
-  else
-  {
-    hide_machine_.SetQuirk(LauncherHideMachine::LOCK_HIDE, false);
-  }
+  hide_machine_.SetQuirk(LauncherHideMachine::LOCK_HIDE, glib::Variant(data).GetBool());
 }
 
 void Launcher::DesaturateIcons()