Merge lp:~mardy/signon-ui/local-interface into lp:signon-ui

[Alberto Mardegan]

Do not instantiate invalid QDBusMessages

QDBus does not allow creating replies out of invalid messages: there's a
Q_ASSERT for that inside the Qt code, which luckily isn't met because Qt is
built with assertions disabled.
Still, we were running into undefined behaviour.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:64
http://s-jenkins:8080/job/online-accounts-signon-ui-ci/14/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/online-accounts-signon-ui-ci/./label=quantal/14/console

review: Needs Fixing (continuous-integration)

[David King (amigadave)]

Seems fine here.

review: Approve

=== modified file 'src/request.cpp'
--- src/request.cpp	2012-03-16 13:06:13 +0000
+++ src/request.cpp	2012-09-24 13:49:22 +0000
@@ -268,7 +268,10 @@
     QDBusPendingReply<> reply =
         webcredentialsIf->ReportFailure(account->id(), notification);
     if (reply.isFinished()) {
-        if (reply.isError()) {
+        if (reply.isError() &&
+            /* if this is a fake D-Bus interface, we get the
+             * "Disconnected" error. */
+            reply.error().type() != QDBusError::Disconnected) {
             BLAME() << "Error dispatching to indicator:" <<
                 reply.error().message();
             return false;

=== modified file 'src/webcredentials_interface.cpp'
--- src/webcredentials_interface.cpp	2012-03-06 12:41:37 +0000
+++ src/webcredentials_interface.cpp	2012-09-24 13:49:22 +0000
@@ -56,6 +56,5 @@
 {
     Q_ASSERT(IndicatorService::instance() != 0);
     IndicatorService::instance()->reportFailure(account_id, notification);
-    QDBusMessage message;
-    return QDBusPendingCall::fromCompletedCall(message.createReply());
+    return QDBusPendingReply<>();
 }