[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] tier1/solid/src/solid/backends/fakehw: Be a bit more tidy with our DBus registr
From:       Kevin Ottens <ervin+bluesystems () kde ! org>
Date:       2013-02-20 12:50:11
Message-ID: 20130220125011.8C933A6148 () git ! kde ! org
[Download RAW message or body]

Git commit cf03367e5c4ccce7ddcff0ae25f2375a85e29fda by Kevin Ottens.
Committed on 20/02/2013 at 13:14.
Pushed by ervin into branch 'frameworks'.

Be a bit more tidy with our DBus registrations

Because of the new garbage collector on the QtDBus side we have to be
more aggressive in the way we unregister from the bus. It's all in all a
good thing, we were managing that in a rather sloppy way before.

M  +1    -0    tier1/solid/src/solid/backends/fakehw/fakedevice.cpp
M  +1    -0    tier1/solid/src/solid/backends/fakehw/fakemanager.cpp

http://commits.kde.org/kdelibs/cf03367e5c4ccce7ddcff0ae25f2375a85e29fda

diff --git a/tier1/solid/src/solid/backends/fakehw/fakedevice.cpp b/tier1/s=
olid/src/solid/backends/fakehw/fakedevice.cpp
index cdd1765..b85da5b 100644
--- a/tier1/solid/src/solid/backends/fakehw/fakedevice.cpp
+++ b/tier1/solid/src/solid/backends/fakehw/fakedevice.cpp
@@ -87,6 +87,7 @@ FakeDevice::FakeDevice(const FakeDevice& dev)
 =

 FakeDevice::~FakeDevice()
 {
+    QDBusConnection::sessionBus().unregisterObject(d->udi, QDBusConnection=
::UnregisterTree);
 }
 =

 QString FakeDevice::udi() const
diff --git a/tier1/solid/src/solid/backends/fakehw/fakemanager.cpp b/tier1/=
solid/src/solid/backends/fakehw/fakemanager.cpp
index 267e51e..61b4e69 100644
--- a/tier1/solid/src/solid/backends/fakehw/fakemanager.cpp
+++ b/tier1/solid/src/solid/backends/fakehw/fakemanager.cpp
@@ -77,6 +77,7 @@ FakeManager::FakeManager(QObject *parent, const QString &=
xmlFile)
 =

 FakeManager::~FakeManager()
 {
+    QDBusConnection::sessionBus().unregisterObject("/org/kde/solid/fakehw"=
, QDBusConnection::UnregisterTree);
     qDeleteAll(d->loadedDevices);
     delete d;
 }

[prev in list] [next in list] [prev in thread] [next in thread]