99e1e347c9
- sync with latest solid/udisks2 upstream bits - Debug output in kdelibs-udisks2-backend.patch should be disabled (#882731)
102 lines
4.7 KiB
Diff
102 lines
4.7 KiB
Diff
From 098fe7e322ad6d0c2af1a9ec0dd3131a0e69aaf8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
|
|
Date: Mon, 3 Dec 2012 16:40:37 +0100
|
|
Subject: [PATCH 06/26] Use QDBusConnection::systemBus() instead of custom
|
|
connection
|
|
|
|
Leftover from previous patch for Solid's UDisks2 backend.
|
|
---
|
|
solid/solid/backends/udisks2/udisksblock.cpp | 5 ++---
|
|
solid/solid/backends/udisks2/udisksblock.h | 1 -
|
|
solid/solid/backends/udisks2/udisksmanager.cpp | 9 ++++-----
|
|
solid/solid/backends/udisks2/udisksmanager.h | 1 -
|
|
4 files changed, 6 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/solid/solid/backends/udisks2/udisksblock.cpp b/solid/solid/backends/udisks2/udisksblock.cpp
|
|
index 027ea03..f3cd1e8 100644
|
|
--- a/solid/solid/backends/udisks2/udisksblock.cpp
|
|
+++ b/solid/solid/backends/udisks2/udisksblock.cpp
|
|
@@ -30,8 +30,7 @@
|
|
using namespace Solid::Backends::UDisks2;
|
|
|
|
Block::Block(Device *dev)
|
|
- : DeviceInterface(dev),
|
|
- m_connection(QDBusConnection::connectToBus(QDBusConnection::SystemBus, "Solid::Udisks2::Block::" + dev->udi()))
|
|
+ : DeviceInterface(dev)
|
|
{
|
|
m_devNum = m_device->prop("DeviceNumber").toULongLong();
|
|
m_devFile = QFile::decodeName(m_device->prop("Device").toByteArray());
|
|
@@ -41,7 +40,7 @@ Block::Block(Device *dev)
|
|
const QString path = "/org/freedesktop/UDisks2/block_devices";
|
|
QDBusMessage call = QDBusMessage::createMethodCall(UD2_DBUS_SERVICE, path,
|
|
DBUS_INTERFACE_INTROSPECT, "Introspect");
|
|
- QDBusPendingReply<QString> reply = m_connection.asyncCall(call);
|
|
+ QDBusPendingReply<QString> reply = QDBusConnection::systemBus().asyncCall(call);
|
|
reply.waitForFinished();
|
|
|
|
if (reply.isValid()) {
|
|
diff --git a/solid/solid/backends/udisks2/udisksblock.h b/solid/solid/backends/udisks2/udisksblock.h
|
|
index 65ef2b8..19cb70a 100644
|
|
--- a/solid/solid/backends/udisks2/udisksblock.h
|
|
+++ b/solid/solid/backends/udisks2/udisksblock.h
|
|
@@ -45,7 +45,6 @@ public:
|
|
virtual int deviceMinor() const;
|
|
virtual int deviceMajor() const;
|
|
private:
|
|
- QDBusConnection m_connection;
|
|
dev_t m_devNum;
|
|
QString m_devFile;
|
|
};
|
|
diff --git a/solid/solid/backends/udisks2/udisksmanager.cpp b/solid/solid/backends/udisks2/udisksmanager.cpp
|
|
index 1cc150c..35b0d23 100644
|
|
--- a/solid/solid/backends/udisks2/udisksmanager.cpp
|
|
+++ b/solid/solid/backends/udisks2/udisksmanager.cpp
|
|
@@ -33,10 +33,9 @@ using namespace Solid::Backends::Shared;
|
|
|
|
Manager::Manager(QObject *parent)
|
|
: Solid::Ifaces::DeviceManager(parent),
|
|
- m_connection(QDBusConnection::connectToBus(QDBusConnection::SystemBus, "Solid::Udisks2")),
|
|
m_manager(UD2_DBUS_SERVICE,
|
|
UD2_DBUS_PATH,
|
|
- m_connection)
|
|
+ QDBusConnection::systemBus())
|
|
{
|
|
m_supportedInterfaces
|
|
<< Solid::DeviceInterface::GenericInterface
|
|
@@ -61,9 +60,9 @@ Manager::Manager(QObject *parent)
|
|
"org.freedesktop.DBus",
|
|
"ListActivatableNames");
|
|
|
|
- QDBusReply<QStringList> reply = m_connection.call(message);
|
|
+ QDBusReply<QStringList> reply = QDBusConnection::systemBus().call(message);
|
|
if (reply.isValid() && reply.value().contains(UD2_DBUS_SERVICE)) {
|
|
- m_connection.interface()->startService(UD2_DBUS_SERVICE);
|
|
+ QDBusConnection::systemBus().interface()->startService(UD2_DBUS_SERVICE);
|
|
serviceFound = true;
|
|
}
|
|
}
|
|
@@ -163,7 +162,7 @@ void Manager::introspect(const QString & path, bool checkOptical)
|
|
if (checkOptical) {
|
|
Device device(udi);
|
|
if (device.mightBeOpticalDisc()) {
|
|
- m_connection.connect(UD2_DBUS_SERVICE, udi, DBUS_INTERFACE_PROPS, "PropertiesChanged", this,
|
|
+ QDBusConnection::systemBus().connect(UD2_DBUS_SERVICE, udi, DBUS_INTERFACE_PROPS, "PropertiesChanged", this,
|
|
SLOT(slotMediaChanged(QDBusMessage)));
|
|
if (!device.isOpticalDisc()) // skip empty CD disc
|
|
continue;
|
|
diff --git a/solid/solid/backends/udisks2/udisksmanager.h b/solid/solid/backends/udisks2/udisksmanager.h
|
|
index bf74703..fb929ce 100644
|
|
--- a/solid/solid/backends/udisks2/udisksmanager.h
|
|
+++ b/solid/solid/backends/udisks2/udisksmanager.h
|
|
@@ -60,7 +60,6 @@ private:
|
|
const QStringList &deviceCache();
|
|
void introspect(const QString & path, bool checkOptical = false);
|
|
QSet<Solid::DeviceInterface::Type> m_supportedInterfaces;
|
|
- QDBusConnection m_connection;
|
|
org::freedesktop::DBus::ObjectManager m_manager;
|
|
QStringList m_deviceCache;
|
|
};
|
|
--
|
|
1.8.0.2
|
|
|