Merge lp:~timo-jyrinki/libusermetrics/dont-share-dbus-sessionbus-connections into lp:libusermetrics

[Timo Jyrinki]

Stop using shared DBus connections

Like https://code.launchpad.net/~unity-api-team/libusermetrics/dont-share-dbus-connections/+merge/257497 but for session bus.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:193
http://jenkins.qa.ubuntu.com/job/libusermetrics-ci/106/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/libusermetrics-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libusermetrics-ci/106/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Combined into https://code.launchpad.net/~unity-api-team/libusermetrics/dont-share-dbus-connections/+merge/257497

Unmerged revisions

193. By Timo Jyrinki on 2015-04-27

Stop using shared DBus connections also for session bus

=== modified file 'src/usermetricsservice/DBusDataSet.cpp'
--- src/usermetricsservice/DBusDataSet.cpp	2013-10-22 08:53:23 +0000
+++ src/usermetricsservice/DBusDataSet.cpp	2015-04-27 11:46:50 +0000
@@ -49,7 +49,8 @@
 }
 
 DBusDataSet::~DBusDataSet() {
-	QDBusConnection connection(QDBusConnection::sessionBus());
+	QDBusConnection connection(QDBusConnection::connectToBus(
+                QDBusConnection::SessionBus, "usermetrics-sessionbus_1"));
 	connection.unregisterObject(m_path);
 }
 

=== modified file 'src/usermetricsservice/DBusDataSource.cpp'
--- src/usermetricsservice/DBusDataSource.cpp	2015-01-29 12:37:39 +0000
+++ src/usermetricsservice/DBusDataSource.cpp	2015-04-27 11:46:50 +0000
@@ -44,7 +44,8 @@
 }
 
 DBusDataSource::~DBusDataSource() {
-	QDBusConnection connection(QDBusConnection::sessionBus());
+	QDBusConnection connection(QDBusConnection::connectToBus(
+                QDBusConnection::SessionBus, "usermetrics-sessionbus_2"));
 	connection.unregisterObject(m_path);
 }
 

=== modified file 'src/usermetricsservice/DBusUserData.cpp'
--- src/usermetricsservice/DBusUserData.cpp	2014-01-20 10:33:36 +0000
+++ src/usermetricsservice/DBusUserData.cpp	2015-04-27 11:46:50 +0000
@@ -56,7 +56,8 @@
 }
 
 DBusUserData::~DBusUserData() {
-	QDBusConnection connection(QDBusConnection::sessionBus());
+	QDBusConnection connection(QDBusConnection::connectToBus(
+                QDBusConnection::SessionBus, "usermetrics-sessionbus_3"));
 	connection.unregisterObject(m_path);
 }