Merge lp:~mitya57/appmenu-qt5/lp1574699 into lp:appmenu-qt5

[Dmitry Shachnev]

Fix for creating two or more system tray icons.

This fixes creating multiple system tray icons.

To achieve this, separate connections are used for every icon.

[Dmitry Shachnev (mitya57)]

Tested with:

* The test example from bug 1574699 (makes it working)
* The test example from QTBUG-53021 (makes it working)
* The systray example from qtbase5-examples (no regression)

[Dmitry Shachnev (mitya57)]

Note: I hope we'll get rid of appmenu-qt5 in Yakkety, but this fix is important for Xenial users.

[Dmitry Shachnev (mitya57)]

Ping? Łukasz, Olivier, can you please review this?

[Dmitry Shachnev (mitya57)]

I have tested it again on a clean system with three programs:

* Test app which creates two different tray icons with menus and submenus;
* The systray example from qtbase5-examples;
* Owncloud-client 2.1.1+dfsg-1ubuntu1 which does not have the workaround.

It works fine so I took the liberty to upload it to yakkety. If nobody complains, I will upload it to Xenial too in a couple of weeks.

=== modified file 'src/appmenuplatformsystemtrayicon.cpp'
--- src/appmenuplatformsystemtrayicon.cpp	2015-06-29 18:47:54 +0000
+++ src/appmenuplatformsystemtrayicon.cpp	2016-05-11 14:57:10 +0000
@@ -41,22 +41,21 @@
 AppMenuPlatformSystemTrayIcon::AppMenuPlatformSystemTrayIcon():
     m_serviceName(KDEItemFormat.arg(QCoreApplication::applicationPid()).arg(++instanceCount)),
     m_objectPath("/StatusNotifierItem"),
+    m_connection(QDBusConnection::connectToBus(QDBusConnection::SessionBus, m_serviceName)),
     m_sniAdaptor(new StatusNotifierItemAdaptor(this)),
     m_dbusMenuExporter(Q_NULLPTR)
 {
     registerMetaTypes();
-    QDBusConnection bus = QDBusConnection::sessionBus();
-    bus.registerService(m_serviceName);
-    bus.registerObject(m_objectPath, this, QDBusConnection::ExportAdaptors);
+    m_connection.registerService(m_serviceName);
+    m_connection.registerObject(m_objectPath, this, QDBusConnection::ExportAdaptors);
     QDBusInterface snw(SNW_SERVICE, SNW_PATH, SNW_INTERFACE);
     snw.asyncCall("RegisterStatusNotifierItem", m_serviceName);
 }
 
 AppMenuPlatformSystemTrayIcon::~AppMenuPlatformSystemTrayIcon()
 {
-    QDBusConnection bus = QDBusConnection::sessionBus();
-    bus.unregisterObject(m_objectPath, QDBusConnection::UnregisterTree);
-    bus.unregisterService(m_serviceName);
+    m_connection.unregisterObject(m_objectPath, QDBusConnection::UnregisterTree);
+    m_connection.unregisterService(m_serviceName);
     delete m_sniAdaptor;
 }
 
@@ -91,7 +90,7 @@
 {
     QMenu *qMenu = qobject_cast<AppMenuPlatformMenu *>(menu)->m_menu;
     QString menuObjectPath = m_objectPath + QStringLiteral("/menu");
-    m_dbusMenuExporter = new DBusMenuExporter(menuObjectPath, qMenu);
+    m_dbusMenuExporter = new DBusMenuExporter(menuObjectPath, qMenu, m_connection);
 }
 
 QRect AppMenuPlatformSystemTrayIcon::geometry() const

=== modified file 'src/appmenuplatformsystemtrayicon.h'
--- src/appmenuplatformsystemtrayicon.h	2015-06-29 18:47:54 +0000
+++ src/appmenuplatformsystemtrayicon.h	2016-05-11 14:57:10 +0000
@@ -95,6 +95,7 @@
     QIcon m_icon;
     QString m_tooltip;
 
+    QDBusConnection m_connection;
     StatusNotifierItemAdaptor *m_sniAdaptor;
     DBusMenuExporter *m_dbusMenuExporter;
 };