Merge lp:~muktupavels/sni-qt/fix-register-item-call into lp:sni-qt

[Alberts Muktupāvels]

Fix RegisterStatusNotifier method call to match specification.

Fix RegisterStatusNotifier method call to match specification.

[Łukasz Zemczak (sil2100)]

Looks good to me, although I didn't test it thoroughly as I would like to test it. I approved the very same change in appmenu-qt5 though, but would be nice if someone else would also give it a spin before top-approving.

review: Approve

[Dmitry Shachnev (mitya57)]

LGTM

review: Approve

=== modified file 'src/statusnotifieritem.cpp'
--- src/statusnotifieritem.cpp	2011-09-27 10:31:01 +0000
+++ src/statusnotifieritem.cpp	2015-07-04 13:56:32 +0000
@@ -64,11 +64,15 @@
     registerMetaTypes();
 
     static int id = 1;
-    m_objectPath = QString("/org/kde/statusnotifieritem/%1").arg(id++);
+    m_serviceName = QString("org.kde.StatusNotifierItem-%1-%2").arg(QCoreApplication::applicationPid()).arg(id++);
+    SNI_VAR(m_serviceName);
+
+    m_objectPath = QString("/StatusNotifierItem");
     SNI_VAR(m_objectPath);
 
     new StatusNotifierItemAdaptor(this);
     QDBusConnection bus = QDBusConnection::sessionBus();
+    bus.registerService(m_serviceName);
     bus.registerObject(m_objectPath, this, QDBusConnection::ExportAdaptors);
 
     updateMenu();
@@ -77,6 +81,11 @@
 StatusNotifierItem::~StatusNotifierItem()
 {
     SNI_VAR(this);
+
+    QDBusConnection bus = QDBusConnection::sessionBus();
+    bus.unregisterObject(m_objectPath, QDBusConnection::UnregisterTree);
+    bus.unregisterService(m_serviceName);
+
     // m_dbusMenuExporter is a child of the menu it exports, so we need to use
     // a QWeakPointer to track it:
     //
@@ -208,6 +217,11 @@
     return m_iconCache->nameForIcon(icon);
 }
 
+QString StatusNotifierItem::serviceName() const
+{
+    return m_serviceName;
+}
+
 QString StatusNotifierItem::objectPath() const
 {
     return m_objectPath;
 
=== modified file 'src/statusnotifieritem.h'
--- src/statusnotifieritem.h	2011-09-27 10:31:01 +0000
+++ src/statusnotifieritem.h	2015-07-04 13:56:32 +0000
@@ -56,6 +56,7 @@
     StatusNotifierItem(QSystemTrayIcon*, IconCache*);
     ~StatusNotifierItem();
 
+    QString serviceName() const;
     QString objectPath() const;
 
     // QAbstractSystemTrayIconSys
@@ -101,6 +102,7 @@
     void sendActivatedByTrigger();
 
 private:
+    QString m_serviceName;
     QString m_objectPath;
     IconCache* m_iconCache;
     QWeakPointer<DBusMenuExporter> m_dbusMenuExporter;
 
=== modified file 'src/statusnotifieritemfactory.cpp'
--- src/statusnotifieritemfactory.cpp	2011-10-14 21:41:08 +0000
+++ src/statusnotifieritemfactory.cpp	2015-07-04 13:56:32 +0000
@@ -145,7 +145,7 @@
 {
     SNI_DEBUG;
     QDBusInterface snw(SNW_SERVICE, SNW_PATH, SNW_IFACE);
-    snw.asyncCall("RegisterStatusNotifierItem", item->objectPath());
+    snw.asyncCall("RegisterStatusNotifierItem", item->serviceName());
 }