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

[Andrea Azzarone]

Manually emit nux::Area::geometry_changed beucase nux can fail to emit it.

== Problem ==
lockscreen - wallpaper is not properly resized when unplugging monitors

== Fix ==
Manually emit nux::Area::geometry_changed beucase nux can fail to emit it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3807
http://jenkins.qa.ubuntu.com/job/unity-ci/935/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/22

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

review: Approve (continuous-integration)

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

review: Approve

=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2014-05-12 22:00:44 +0000
+++ lockscreen/LockScreenController.cpp	2014-05-28 09:28:28 +0000
@@ -204,11 +204,18 @@
       is_new = true;
     }
 
-    shield->SetGeometry(monitors[i]);
-    shield->SetMinMaxSize(monitors[i].width, monitors[i].height);
+    auto old_geo = shield->GetGeometry();
+    auto new_geo = monitors[i];
+
+    shield->SetGeometry(new_geo);
+    shield->SetMinMaxSize(new_geo.width, new_geo.height);
     shield->primary = (i == primary);
     shield->monitor = i;
 
+    // XXX: manually emit nux::Area::geometry_changed beucase nux can fail to emit it.
+    if (old_geo != new_geo)
+      shield->geometry_changed.emit(shield.GetPointer(), new_geo);
+
     if (is_new && fade_animator_.GetCurrentValue() > 0)
     {
       shield->SetOpacity(fade_animator_.GetCurrentValue());