git.iko.soy/unity8
on xenial help sign in
better
15ec470Nick Dedekind
plugins/AccountsService/AccountsService.cpp+9−9
compare with xenial
unifiedsplit
@@ -126,7 +126,7 @@ bool AccountsService::hereLicensePathValid() const
126
126
127void AccountsService::updateDemoEdges(bool async)
127void AccountsService::updateDemoEdges(bool async)
128{
128{
129− QDBusPendingReply<QDBusVariant> pendingReply = m_service->getUserPropertyAsync(m_user, "com.canonical.unity.AccountsService", "demo-edges");
129+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user, "com.canonical.unity.AccountsService", "demo-edges");
130 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
130 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
131
131
132 connect(watcher, &QDBusPendingCallWatcher::finished,
132 connect(watcher, &QDBusPendingCallWatcher::finished,
@@ -151,7 +151,7 @@ void AccountsService::updateDemoEdges(bool async)
151
151
152void AccountsService::updateEnableLauncherWhileLocked(bool async)
152void AccountsService::updateEnableLauncherWhileLocked(bool async)
153{
153{
154− QDBusPendingReply<QDBusVariant> pendingReply = m_service->getUserPropertyAsync(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableLauncherWhileLocked");
154+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableLauncherWhileLocked");
155 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
155 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
156
156
157 connect(watcher, &QDBusPendingCallWatcher::finished,
157 connect(watcher, &QDBusPendingCallWatcher::finished,
@@ -176,7 +176,7 @@ void AccountsService::updateEnableLauncherWhileLocked(bool async)
176
176
177void AccountsService::updateEnableIndicatorsWhileLocked(bool async)
177void AccountsService::updateEnableIndicatorsWhileLocked(bool async)
178{
178{
179− QDBusPendingReply<QDBusVariant> pendingReply = m_service->getUserPropertyAsync(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableIndicatorsWhileLocked");
179+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableIndicatorsWhileLocked");
180 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
180 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
181
181
182 connect(watcher, &QDBusPendingCallWatcher::finished,
182 connect(watcher, &QDBusPendingCallWatcher::finished,
@@ -201,7 +201,7 @@ void AccountsService::updateEnableIndicatorsWhileLocked(bool async)
201
201
202void AccountsService::updateBackgroundFile(bool async)
202void AccountsService::updateBackgroundFile(bool async)
203{
203{
204− QDBusPendingReply<QDBusVariant> pendingReply = m_service->getUserPropertyAsync(m_user, "org.freedesktop.Accounts.User", "BackgroundFile");
204+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user, "org.freedesktop.Accounts.User", "BackgroundFile");
205 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
205 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
206
206
207 connect(watcher, &QDBusPendingCallWatcher::finished,
207 connect(watcher, &QDBusPendingCallWatcher::finished,
@@ -226,7 +226,7 @@ void AccountsService::updateBackgroundFile(bool async)
226
226
227void AccountsService::updateStatsWelcomeScreen(bool async)
227void AccountsService::updateStatsWelcomeScreen(bool async)
228{
228{
229− QDBusPendingReply<QDBusVariant> pendingReply = m_service->getUserPropertyAsync(m_user, "com.ubuntu.touch.AccountsService.SecurityPrivacy", "StatsWelcomeScreen");
229+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user, "com.ubuntu.touch.AccountsService.SecurityPrivacy", "StatsWelcomeScreen");
230 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
230 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
231
231
232 connect(watcher, &QDBusPendingCallWatcher::finished,
232 connect(watcher, &QDBusPendingCallWatcher::finished,
@@ -251,7 +251,7 @@ void AccountsService::updateStatsWelcomeScreen(bool async)
251
251
252void AccountsService::updatePasswordDisplayHint(bool async)
252void AccountsService::updatePasswordDisplayHint(bool async)
253{
253{
254− QDBusPendingReply<QDBusVariant> pendingReply = m_service->getUserPropertyAsync(m_user, "com.ubuntu.touch.AccountsService.SecurityPrivacy", "StatsWelcomeScreen");
254+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user, "com.ubuntu.touch.AccountsService.SecurityPrivacy", "StatsWelcomeScreen");
255 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
255 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
256
256
257 connect(watcher, &QDBusPendingCallWatcher::finished,
257 connect(watcher, &QDBusPendingCallWatcher::finished,
@@ -276,7 +276,7 @@ void AccountsService::updatePasswordDisplayHint(bool async)
276
276
277void AccountsService::updateFailedLogins(bool async)
277void AccountsService::updateFailedLogins(bool async)
278{
278{
279− QDBusPendingReply<QDBusVariant> pendingReply = m_service->getUserPropertyAsync(m_user, "com.canonical.unity.AccountsService.Private", "FailedLogins");
279+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user, "com.canonical.unity.AccountsService.Private", "FailedLogins");
280 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
280 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
281
281
282 connect(watcher, &QDBusPendingCallWatcher::finished,
282 connect(watcher, &QDBusPendingCallWatcher::finished,
@@ -301,7 +301,7 @@ void AccountsService::updateFailedLogins(bool async)
301
301
302void AccountsService::updateHereEnabled(bool async)
302void AccountsService::updateHereEnabled(bool async)
303{
303{
304− QDBusPendingReply<QDBusVariant> pendingReply = m_service->getUserPropertyAsync(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted");
304+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted");
305 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
305 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
306
306
307 connect(watcher, &QDBusPendingCallWatcher::finished,
307 connect(watcher, &QDBusPendingCallWatcher::finished,
@@ -326,7 +326,7 @@ void AccountsService::updateHereEnabled(bool async)
326
326
327void AccountsService::updateHereLicensePath(bool async)
327void AccountsService::updateHereLicensePath(bool async)
328{
328{
329− QDBusPendingReply<QDBusVariant> pendingReply = m_service->getUserPropertyAsync(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseBasePath");
329+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseBasePath");
330 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
330 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
331
331
332 connect(watcher, &QDBusPendingCallWatcher::finished,
332 connect(watcher, &QDBusPendingCallWatcher::finished,
plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+4−3
@@ -55,7 +55,7 @@ QDBusPendingReply<QDBusVariant> AccountsServiceDBusAdaptor::getUserPropertyAsync
55 if (iface != nullptr && iface->isValid()) {
55 if (iface != nullptr && iface->isValid()) {
56 return iface->asyncCall("Get", interface, property);
56 return iface->asyncCall("Get", interface, property);
57 }
57 }
58− return QDBusPendingReply<QVariant>();
58+ return QDBusPendingReply<QVariant>(QDBusMessage::createError(QDBusError::Other, "Invalid Interface"));
59}
59}
60
60
61void AccountsServiceDBusAdaptor::setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value)
61void AccountsServiceDBusAdaptor::setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value)
@@ -67,13 +67,14 @@ void AccountsServiceDBusAdaptor::setUserProperty(const QString &user, const QStr
67 }
67 }
68}
68}
69
69
70−void AccountsServiceDBusAdaptor::setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value)
70+QDBusPendingCall AccountsServiceDBusAdaptor::setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value)
71{
71{
72 QDBusInterface *iface = getUserInterface(user);
72 QDBusInterface *iface = getUserInterface(user);
73 if (iface != nullptr && iface->isValid()) {
73 if (iface != nullptr && iface->isValid()) {
74 // The value needs to be carefully wrapped
74 // The value needs to be carefully wrapped
75− iface->asyncCall("Set", interface, property, QVariant::fromValue(QDBusVariant(value)));
75+ return iface->asyncCall("Set", interface, property, QVariant::fromValue(QDBusVariant(value)));
76 }
76 }
77+ return QDBusPendingCall::fromCompletedCall(QDBusMessage::createError(QDBusError::Other, "Invalid Interface"));
77}
78}
78
79
79void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid)
80void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid)
plugins/AccountsService/AccountsServiceDBusAdaptor.h+1−1
@@ -47,7 +47,7 @@ public:
47 }
47 }
48
48
49 Q_INVOKABLE void setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value);
49 Q_INVOKABLE void setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value);
50− Q_INVOKABLE void setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value);
50+ Q_INVOKABLE QDBusPendingCall setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value);
51
51
52Q_SIGNALS:
52Q_SIGNALS:
53 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
53 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);