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

[Andrea Azzarone]

Actually connect to changed::* signal in UnitySettings.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/1148/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/35

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

review: Approve (continuous-integration)

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

+1

review: Approve

=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2014-12-19 13:03:44 +0000
+++ unity-shared/UnitySettings.cpp	2015-02-04 15:28:50 +0000
@@ -91,18 +91,6 @@
     for (unsigned i = 0; i < monitors::MAX; ++i)
       em_converters_.emplace_back(std::make_shared<EMConverter>());
 
-    // The order is important here, DPI is the last thing to be updated
-    UpdateLimSetting();
-    UpdateTextScaleFactor();
-    UpdateCursorScaleFactor();
-    UpdateFontSize();
-    UpdateDPI();
-
-    CacheFormFactor();
-    CacheDoubleClickActivate();
-
-    UScreen::GetDefault()->changed.connect(sigc::hide(sigc::hide(sigc::mem_fun(this, &Impl::UpdateDPI))));
-
     signals_.Add<void, GSettings*, const gchar*>(usettings_, "changed::" + FORM_FACTOR, [this] (GSettings*, const gchar*) {
       CacheFormFactor();
     });
@@ -150,6 +138,18 @@
     signals_.Add<void, GSettings*, const gchar*>(lim_settings_, "changed", [this] (GSettings*, const gchar*) {
       UpdateLimSetting();
     });
+
+    UScreen::GetDefault()->changed.connect(sigc::hide(sigc::hide(sigc::mem_fun(this, &Impl::UpdateDPI))));
+
+    // The order is important here, DPI is the last thing to be updated
+    UpdateLimSetting();
+    UpdateTextScaleFactor();
+    UpdateCursorScaleFactor();
+    UpdateFontSize();
+    UpdateDPI();
+
+    CacheFormFactor();
+    CacheDoubleClickActivate();
   }
 
   void CacheFormFactor()