git.iko.soy/unity8
on xenial help sign in
uppercase actually
commit2f488d46a6b669d191f770909fe4deb2d8f6fbc2 authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 4 Feb 2015, 16:12 (12 years ago) parente030165
7 files changed+10−10
compare with xenial
unifiedsplit
plugins/AccountsService/com.canonical.unity.AccountsService.xml+1−1 plugins/Greeter/Unity/Launcher/launchermodelas.cpp+2−2 plugins/Unity/Launcher/asadapter.cpp+1−1 tests/plugins/Greeter/Unity/Launcher/AccountsServiceDBusAdaptor.cpp+2−2 tests/plugins/Greeter/Unity/Launcher/AccountsServiceDBusAdaptor.h+1−1 tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp+2−2 tests/plugins/Unity/Launcher/launchermodeltest.cpp+1−1
plugins/AccountsService/com.canonical.unity.AccountsService.xml+1−1
@@ -14,7 +14,7 @@
1414 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
1515 </property>
1616
17− <property name="launcherItems" type="aa{sv}" access="readwrite">
17+ <property name="LauncherItems" type="aa{sv}" access="readwrite">
1818 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
1919 </property>
2020
plugins/Greeter/Unity/Launcher/launchermodelas.cpp+2−2
@@ -179,7 +179,7 @@ void LauncherModel::refresh()
179179 QList<QVariantMap> items;
180180
181181 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");
183183 }
184184
185185 // First walk through all the existing items and see if we need to remove something
@@ -245,7 +245,7 @@ void LauncherModel::refresh()
245245
246246void LauncherModel::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
247247{
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")) {
249249 return;
250250 }
251251 refresh();
plugins/Unity/Launcher/asadapter.cpp+1−1
@@ -46,7 +46,7 @@ void ASAdapter::syncItems(QList<LauncherItem *> m_list)
4646 items << itemToVariant(item);
4747 }
4848
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));
5050 }
5151}
5252
tests/plugins/Greeter/Unity/Launcher/AccountsServiceDBusAdaptor.cpp+2−2
@@ -33,7 +33,7 @@ QVariant AccountsServiceDBusAdaptor::getUserProperty(const QString &user, const
3333{
3434 Q_UNUSED(user)
3535 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)
3737
3838 QDBusMessage msg;
3939 QVariant v = QVariant::fromValue(properties);
@@ -46,7 +46,7 @@ QVariant AccountsServiceDBusAdaptor::getUserProperty(const QString &user, const
4646
4747void AccountsServiceDBusAdaptor::simulatePropertyChange(const QString &user, const QString &property, const QVariant &value)
4848{
49− Q_ASSERT(property == "launcherItems");
49+ Q_ASSERT(property == "LauncherItems");
5050 properties = value.value<QList<QVariantMap>>();
5151 Q_EMIT propertiesChanged(user, "com.canonical.unity.AccountsService", QStringList() << property);
5252}
tests/plugins/Greeter/Unity/Launcher/AccountsServiceDBusAdaptor.h+1−1
@@ -40,7 +40,7 @@ public:
4040 inline T getUserProperty(const QString &user, const QString &interface, const QString &property) {
4141 Q_UNUSED(user)
4242 Q_UNUSED(interface)
43− Q_ASSERT(property == "launcherItems");
43+ Q_ASSERT(property == "LauncherItems");
4444 T ret = properties;
4545 return ret;
4646 }
tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp+2−2
@@ -108,7 +108,7 @@ private Q_SLOTS:
108108 newEntry.insert("count", 0);
109109 newEntry.insert("countVisible", false);
110110 newList.append(newEntry);
111− model->m_accounts->simulatePropertyChange(changedUser, "launcherItems", QVariant::fromValue(newList));
111+ model->m_accounts->simulatePropertyChange(changedUser, "LauncherItems", QVariant::fromValue(newList));
112112
113113 QCOMPARE(isInSync(model), inSync);
114114
@@ -127,7 +127,7 @@ private Q_SLOTS:
127127 entry["countVisible"] = true;
128128 entry["count"] = 55;
129129 newList[0] = entry;
130− model->m_accounts->simulatePropertyChange("dummy", "launcherItems", QVariant::fromValue(newList));
130+ model->m_accounts->simulatePropertyChange("dummy", "LauncherItems", QVariant::fromValue(newList));
131131
132132 QCOMPARE(isInSync(model), true);
133133
tests/plugins/Unity/Launcher/launchermodeltest.cpp+1−1
@@ -133,7 +133,7 @@ private:
133133
134134 QList<QVariantMap> getASConfig() {
135135 AccountsServiceDBusAdaptor *as = launcherModel->m_asAdapter->m_accounts;
136− return as->getUserProperty("", "", "launcherItems").value<QList<QVariantMap>>();
136+ return as->getUserProperty("", "", "LauncherItems").value<QList<QVariantMap>>();
137137 }
138138
139139private Q_SLOTS: