99e1e347c9
- sync with latest solid/udisks2 upstream bits - Debug output in kdelibs-udisks2-backend.patch should be disabled (#882731)
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From f883796dff6956c51d2b2494a600a935bd910a5a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
|
|
Date: Mon, 3 Dec 2012 16:57:05 +0100
|
|
Subject: [PATCH 07/26] Ignore UDisks2 jobs
|
|
|
|
Jobs don't represent any devices, so we can just ignore them.
|
|
---
|
|
solid/solid/backends/udisks2/udisksmanager.cpp | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
diff --git a/solid/solid/backends/udisks2/udisksmanager.cpp b/solid/solid/backends/udisks2/udisksmanager.cpp
|
|
index 35b0d23..ecb9add 100644
|
|
--- a/solid/solid/backends/udisks2/udisksmanager.cpp
|
|
+++ b/solid/solid/backends/udisks2/udisksmanager.cpp
|
|
@@ -191,6 +191,11 @@ void Manager::slotInterfacesAdded(const QDBusObjectPath &object_path, const QVar
|
|
{
|
|
const QString udi = object_path.path();
|
|
|
|
+ /* Ignore jobs */
|
|
+ if (udi.startsWith(UD2_DBUS_PATH_JOBS)) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
qDebug() << udi << "has new interfaces:" << interfaces_and_properties.keys();
|
|
|
|
// new device, we don't know it yet
|
|
@@ -204,6 +209,11 @@ void Manager::slotInterfacesRemoved(const QDBusObjectPath &object_path, const QS
|
|
{
|
|
const QString udi = object_path.path();
|
|
|
|
+ /* Ignore jobs */
|
|
+ if (udi.startsWith(UD2_DBUS_PATH_JOBS)) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
qDebug() << udi << "lost interfaces:" << interfaces;
|
|
|
|
Device device(udi);
|
|
--
|
|
1.8.0.2
|
|
|