git.iko.soy/unity8
on xenial help sign in
uppercase actually
2f488d4Michael Zanetti
plugins/AccountsService/com.canonical.unity.AccountsService.xml+1−1
compare with xenial
unifiedsplit
@@ -14,7 +14,7 @@
14 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
14 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
15 </property>
15 </property>
16
16
17− <property name="launcherItems" type="aa{sv}" access="readwrite">
17+ <property name="LauncherItems" type="aa{sv}" access="readwrite">
18 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
18 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
19 </property>
19 </property>
20
20
plugins/Greeter/Unity/Launcher/launchermodelas.cpp+2−2
@@ -179,7 +179,7 @@ void LauncherModel::refresh()
179 QList<QVariantMap> items;
179 QList<QVariantMap> items;
180
180
181 if (m_accounts && !m_user.isEmpty()) {
181 if (m_accounts && !m_user.isEmpty()) {
182− items = m_accounts->getUserProperty<VariantMapList>(m_user, "com.canonical.unity.AccountsService", "launcherItems");
182+ items = m_accounts->getUserProperty<VariantMapList>(m_user, "com.canonical.unity.AccountsService", "LauncherItems");
183 }
183 }
184
184
185 // First walk through all the existing items and see if we need to remove something
185 // First walk through all the existing items and see if we need to remove something
@@ -245,7 +245,7 @@ void LauncherModel::refresh()
245
245
246void LauncherModel::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
246void LauncherModel::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
247{
247{
248− if (user != m_user || interface != "com.canonical.unity.AccountsService" || !changed.contains("launcherItems")) {
248+ if (user != m_user || interface != "com.canonical.unity.AccountsService" || !changed.contains("LauncherItems")) {
249 return;
249 return;
250 }
250 }
251 refresh();
251 refresh();
plugins/Unity/Launcher/asadapter.cpp+1−1
@@ -46,7 +46,7 @@ void ASAdapter::syncItems(QList<LauncherItem *> m_list)
46 items << itemToVariant(item);
46 items << itemToVariant(item);
47 }
47 }
48
48
49− m_accounts->setUserPropertyAsync(m_user, "com.canonical.unity.AccountsService", "launcherItems", QVariant::fromValue(items));
49+ m_accounts->setUserPropertyAsync(m_user, "com.canonical.unity.AccountsService", "LauncherItems", QVariant::fromValue(items));
50 }
50 }
51}
51}
52
52
tests/plugins/Greeter/Unity/Launcher/AccountsServiceDBusAdaptor.cpp+2−2
@@ -33,7 +33,7 @@ QVariant AccountsServiceDBusAdaptor::getUserProperty(const QString &user, const
33{
33{
34 Q_UNUSED(user)
34 Q_UNUSED(user)
35 Q_UNUSED(interface)
35 Q_UNUSED(interface)
36− Q_UNUSED(property) // We only fake one property here (launcherItems)
36+ Q_UNUSED(property) // We only fake one property here (LauncherItems)
37
37
38 QDBusMessage msg;
38 QDBusMessage msg;
39 QVariant v = QVariant::fromValue(properties);
39 QVariant v = QVariant::fromValue(properties);
@@ -46,7 +46,7 @@ QVariant AccountsServiceDBusAdaptor::getUserProperty(const QString &user, const
46
46
47void AccountsServiceDBusAdaptor::simulatePropertyChange(const QString &user, const QString &property, const QVariant &value)
47void AccountsServiceDBusAdaptor::simulatePropertyChange(const QString &user, const QString &property, const QVariant &value)
48{
48{
49− Q_ASSERT(property == "launcherItems");
49+ Q_ASSERT(property == "LauncherItems");
50 properties = value.value<QList<QVariantMap>>();
50 properties = value.value<QList<QVariantMap>>();
51 Q_EMIT propertiesChanged(user, "com.canonical.unity.AccountsService", QStringList() << property);
51 Q_EMIT propertiesChanged(user, "com.canonical.unity.AccountsService", QStringList() << property);
52}
52}
tests/plugins/Greeter/Unity/Launcher/AccountsServiceDBusAdaptor.h+1−1
@@ -40,7 +40,7 @@ public:
40 inline T getUserProperty(const QString &user, const QString &interface, const QString &property) {
40 inline T getUserProperty(const QString &user, const QString &interface, const QString &property) {
41 Q_UNUSED(user)
41 Q_UNUSED(user)
42 Q_UNUSED(interface)
42 Q_UNUSED(interface)
43− Q_ASSERT(property == "launcherItems");
43+ Q_ASSERT(property == "LauncherItems");
44 T ret = properties;
44 T ret = properties;
45 return ret;
45 return ret;
46 }
46 }
tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp+2−2
@@ -108,7 +108,7 @@ private Q_SLOTS:
108 newEntry.insert("count", 0);
108 newEntry.insert("count", 0);
109 newEntry.insert("countVisible", false);
109 newEntry.insert("countVisible", false);
110 newList.append(newEntry);
110 newList.append(newEntry);
111− model->m_accounts->simulatePropertyChange(changedUser, "launcherItems", QVariant::fromValue(newList));
111+ model->m_accounts->simulatePropertyChange(changedUser, "LauncherItems", QVariant::fromValue(newList));
112
112
113 QCOMPARE(isInSync(model), inSync);
113 QCOMPARE(isInSync(model), inSync);
114
114
@@ -127,7 +127,7 @@ private Q_SLOTS:
127 entry["countVisible"] = true;
127 entry["countVisible"] = true;
128 entry["count"] = 55;
128 entry["count"] = 55;
129 newList[0] = entry;
129 newList[0] = entry;
130− model->m_accounts->simulatePropertyChange("dummy", "launcherItems", QVariant::fromValue(newList));
130+ model->m_accounts->simulatePropertyChange("dummy", "LauncherItems", QVariant::fromValue(newList));
131
131
132 QCOMPARE(isInSync(model), true);
132 QCOMPARE(isInSync(model), true);
133
133
tests/plugins/Unity/Launcher/launchermodeltest.cpp+1−1
@@ -133,7 +133,7 @@ private:
133
133
134 QList<QVariantMap> getASConfig() {
134 QList<QVariantMap> getASConfig() {
135 AccountsServiceDBusAdaptor *as = launcherModel->m_asAdapter->m_accounts;
135 AccountsServiceDBusAdaptor *as = launcherModel->m_asAdapter->m_accounts;
136− return as->getUserProperty("", "", "launcherItems").value<QList<QVariantMap>>();
136+ return as->getUserProperty("", "", "LauncherItems").value<QList<QVariantMap>>();
137 }
137 }
138
138
139private Q_SLOTS:
139private Q_SLOTS: