← Back to branch summary

~ubuntu-branches/ubuntu/wily/ubuntu-system-settings-online-accounts/wily

« back to all changes in this revision

Viewing changes to client/OnlineAccountsClient/setup.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, CI bot, Alberto Mardegan
  • Date: 2014-09-17 09:05:56 UTC
  • mfrom: (1.1.34)
  • Revision ID: package-import@ubuntu.com-20140917090556-ti3eucl8vjcjllxq
Tags: 0.4+14.10.20140917-0ubuntu1
[ CI bot ]
* Resync trunk

[ Alberto Mardegan ]
* Don't go back to SystemSettings when creating the first account.
  Keep listening to account model changes. Set QML import path for
  click plugins. Enable automatic orientation .

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/OnlineAccountsClient/setup.cpp
129
129
 
130
130
    watcher->deleteLater();
131
131
 
 
132
    QVariantMap response;
 
133
 
132
134
    QDBusPendingReply<QVariantMap> reply = *watcher;
133
135
    if (reply.isError()) {
134
136
        qWarning() << "RequestAccess failed:" << reply.error();
135
137
    } else {
136
138
        // At the moment, we don't have any use for the reply.
 
139
        response = reply.value();
137
140
    }
138
141
 
139
 
    Q_EMIT q->finished();
 
142
    Q_EMIT q->finished(response);
140
143
}
141
144
 
142
145
/*!