Merge lp:~azzar1/unity/lp-1411620 into lp:unity

[Andrea Azzarone]

Actually connect to changed::* signal in MenuManager.cpp.

Due to a change in gsettings we to connect to the change signal before getting the value. I'm actually working on GSettingsProperty that should make gsettings easier to use in Unity. I still need some time, so it's better to send this before.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3915
http://jenkins.qa.ubuntu.com/job/unity-ci/1147/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/34

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

review: Approve (continuous-integration)

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

+1

review: Approve

=== modified file 'unity-shared/MenuManager.cpp'
--- unity-shared/MenuManager.cpp	2014-12-19 13:03:44 +0000
+++ unity-shared/MenuManager.cpp	2015-02-04 11:16:49 +0000
@@ -59,15 +59,15 @@
     indicators_->on_entry_activate_request.connect(sigc::mem_fun(this, &Impl::ActivateRequest));
     indicators_->icon_paths_changed.connect(sigc::mem_fun(this, &Impl::IconPathsChanged));
 
-    parent_->integrated_menus = g_settings_get_boolean(settings_, LIM_KEY.c_str());
-    parent_->always_show_menus = g_settings_get_boolean(settings_, ALWAYS_SHOW_MENUS_KEY.c_str());
-
     signals_.Add<void, GSettings*, const gchar*>(settings_, "changed::" + LIM_KEY, [this] (GSettings*, const gchar*) {
       parent_->integrated_menus = g_settings_get_boolean(settings_, LIM_KEY.c_str());
     });
     signals_.Add<void, GSettings*, const gchar*>(settings_, "changed::" + ALWAYS_SHOW_MENUS_KEY, [this] (GSettings*, const gchar*) {
       parent_->always_show_menus = g_settings_get_boolean(settings_, ALWAYS_SHOW_MENUS_KEY.c_str());
     });
+
+    parent_->integrated_menus = g_settings_get_boolean(settings_, LIM_KEY.c_str());
+    parent_->always_show_menus = g_settings_get_boolean(settings_, ALWAYS_SHOW_MENUS_KEY.c_str());
   }
 
   ~Impl()