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

[Andrea Azzarone]

Set the correct size for the lockscreen message.

[Brandon Schaefer (brandontschaefer)]

DOES NOT LOOK GOOD TO ME (just kidding)

review: Approve

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

review: Approve

[Stephen M. Webb (bregma)]

FTBFS (see inline comments).

review: Needs Fixing

[Andrea Azzarone (azzar1)]

Fixed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3886
http://jenkins.qa.ubuntu.com/job/unity-ci/1119/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/6

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

review: Needs Fixing (continuous-integration)

=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2014-08-25 20:46:31 +0000
+++ lockscreen/UserPromptView.cpp	2014-11-28 13:29:17 +0000
@@ -370,8 +370,7 @@
   view->SetFont(Settings::Instance().font_name());
   view->SetTextColor(color);
   view->SetText(message);
-  view->SetMaximumWidth(geo.width);
-
+  view->SetMaximumWidth(geo.width - PADDING.CP(scale)*2);
   msg_layout_->AddView(view);
 
   GetLayout()->ComputeContentPosition(0, 0);