git.iko.soy/unity8
on xenial help sign in
fix DBusVariant converion
commit2682bc37d28603b136e89cb7fbea91585750d6b4 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 30 Oct 2014, 19:51 (12 years ago) parent96445fc
2 files changed+4−4
compare with xenial
unifiedsplit
plugins/Unity/Launcher/dbusinterface.cpp+2−2 tests/plugins/Unity/Launcher/launchermodeltest.cpp+2−2
plugins/Unity/Launcher/dbusinterface.cpp+2−2
@@ -183,13 +183,13 @@ bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnec
183183 }
184184 } else if (message.member() == "Set") {
185185 if (message.arguments()[1].toString() == "count") {
186− int newCount = message.arguments()[2].toInt();
186+ int newCount = message.arguments()[2].value<QDBusVariant>().variant().toInt();
187187 if (!item || newCount != item->count()) {
188188 Q_EMIT countChanged(appid, newCount);
189189 emitPropChangedDbus(appid, "count", QVariant(newCount));
190190 }
191191 } else if (message.arguments()[1].toString() == "countVisible") {
192− bool newVisible = message.arguments()[2].toBool();
192+ bool newVisible = message.arguments()[2].value<QDBusVariant>().variant().toBool();
193193 if (!item || newVisible != item->countVisible()) {
194194 Q_EMIT countVisibleChanged(appid, newVisible);
195195 emitPropChangedDbus(appid, "countVisible", newVisible);
tests/plugins/Unity/Launcher/launchermodeltest.cpp+2−2
@@ -351,8 +351,8 @@ private Q_SLOTS:
351351 QCOMPARE(map.value("countVisible").toBool(), false);
352352
353353 // Now make it visible and set it to 55 through D-Bus
354− interface.call("Set", "com.canonical.Unity.Launcher.Item", "count", 55);
355− interface.call("Set", "com.canonical.Unity.Launcher.Item", "countVisible", true);
354+ interface.call("Set", "com.canonical.Unity.Launcher.Item", "count", QVariant::fromValue(QDBusVariant(55)));
355+ interface.call("Set", "com.canonical.Unity.Launcher.Item", "countVisible", QVariant::fromValue(QDBusVariant(true)));
356356
357357 // Fetch it again using GetAll
358358 reply = interface.call("GetAll");