Merge lp:~marcustomlinson/unity-scopes-shell/fix_oa_hang into lp:unity-scopes-shell

[Marcus Tomlinson]

OnlineAccountsClient::Setup::finished signature changed causing a hang. Use safer C++11-style connect()

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/236/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/133
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/133/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/136

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

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2014-09-17 15:25:58 +0000
+++ src/Unity/scope.cpp	2014-09-25 05:58:16 +0000
@@ -1239,7 +1239,7 @@
         setup.exec();
 
         QEventLoop loop;
-        connect(&setup, SIGNAL(finished()), &loop, SLOT(quit()));
+        connect(&setup, &OnlineAccountsClient::Setup::finished, &loop, &QEventLoop::quit);
         loop.exec(QEventLoop::ProcessEventsFlag::ExcludeUserInputEvents);
 
         // Check again whether the service was successfully enabled