git.iko.soy/unity8
on xenial help sign in
drop dbusinterface changes
commitd5c26b51acbda7ed215898519b64b6fe4e6539cf authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 21 Jul 2015, 20:11 (11 years ago) parent98629ae
4 files changed+3−24
compare with xenial
unifiedsplit
plugins/Unity/Launcher/dbusinterface.cpp−9 plugins/Unity/Launcher/dbusinterface.h−1 plugins/Unity/Launcher/launchermodel.cpp+3−13 plugins/Unity/Launcher/launchermodel.h−1
plugins/Unity/Launcher/dbusinterface.cpp−9
@@ -164,8 +164,6 @@ bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnec
164164 retval.append(QVariant::fromValue(QDBusVariant(item->count())));
165165 } else if (message.arguments()[1].toString() == "countVisible") {
166166 retval.append(QVariant::fromValue(QDBusVariant(item->countVisible())));
167− } else if (message.arguments()[1].toString() == "running") {
168− retval.append(QVariant::fromValue(QDBusVariant(item->running())));
169167 }
170168 } else if (message.member() == "Set") {
171169 if (message.arguments()[1].toString() == "count") {
@@ -180,19 +178,12 @@ bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnec
180178 Q_EMIT countVisibleChanged(appid, newVisible);
181179 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "countVisible", newVisible);
182180 }
183− } else if (message.arguments()[1].toString() == "running") {
184− bool newRunning = message.arguments()[2].value<QDBusVariant>().variant().toBool();
185− if (!item || newRunning != item->running()) {
186− Q_EMIT runningChanged(appid, newRunning);
187− notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "running", newRunning);
188− }
189181 }
190182 } else if (message.member() == "GetAll") {
191183 if (item) {
192184 QVariantMap all;
193185 all.insert("count", item->count());
194186 all.insert("countVisible", item->countVisible());
195− all.insert("running", item->running());
196187 retval.append(all);
197188 }
198189 } else {
plugins/Unity/Launcher/dbusinterface.h−1
@@ -36,7 +36,6 @@ public:
3636Q_SIGNALS:
3737 void countChanged(const QString &appId, int count);
3838 void countVisibleChanged(const QString &appId, bool countVisible);
39− void runningChanged(const QString &appId, bool running);
4039 void refreshCalled();
4140
4241private:
plugins/Unity/Launcher/launchermodel.cpp+3−13
@@ -40,7 +40,6 @@ LauncherModel::LauncherModel(QObject *parent):
4040{
4141 connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);
4242 connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);
43− connect(m_dbusIface, &DBusInterface::runningChanged, this, &LauncherModel::runningChanged);
4443 connect(m_dbusIface, &DBusInterface::refreshCalled, this, &LauncherModel::refresh);
4544
4645 connect(m_settings, &GSettings::changed, this, &LauncherModel::refresh);
@@ -198,7 +197,9 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex
198197 } else if (actionId == "launch_item") {
199198 QDesktopServices::openUrl(getUrlForAppId(appId));
200199 } else if (actionId == "stop_item") { // Quit
201− m_appManager->stopApplication(appId);
200+ if (m_appManager) {
201+ m_appManager->stopApplication(appId);
202+ }
202203 // Nope, we don't know this action, let the backend forward it to the application
203204 } else {
204205 // TODO: forward quicklist action to app, possibly via m_dbusIface
@@ -335,17 +336,6 @@ void LauncherModel::progressChanged(const QString &appId, int progress)
335336 }
336337}
337338
338−void LauncherModel::runningChanged(const QString &appId, bool running)
339−{
340− const int idx = findApplication(appId);
341− if (idx >= 0) {
342− LauncherItem *item = m_list.at(idx);
343− item->setRunning(running);
344− m_asAdapter->syncItems(m_list);
345− Q_EMIT dataChanged(index(idx), index(idx), {RoleRunning});
346− }
347−}
348−
349339void LauncherModel::countChanged(const QString &appId, int count)
350340{
351341 const int idx = findApplication(appId);
plugins/Unity/Launcher/launchermodel.h−1
@@ -73,7 +73,6 @@ private Q_SLOTS:
7373 void countChanged(const QString &appId, int count);
7474 void countVisibleChanged(const QString &appId, int count);
7575 void progressChanged(const QString &appId, int progress);
76− void runningChanged(const QString &appId, bool running);
7776
7877 void applicationAdded(const QModelIndex &parent, int row);
7978 void applicationRemoved(const QModelIndex &parent, int row);