rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

also fix removing 2-stage devices

This commit is contained in:
Lukáš Tinkl 2013-02-07 14:40:09 +01:00
parent bb04e0a72d
commit 411209b447
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kdelibs-udisks2_2_stage.patch
View File

@ -1,7 +1,8 @@
diff -up kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp.udisks2_2_stage kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp
--- kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp.udisks2_2_stage 2013-01-23 15:44:27.000000000 -0600
+++ kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp 2013-02-01 09:43:49.032367743 -0600
@@ -203,6 +203,10 @@ void Manager::slotInterfacesAdded(const
diff --git a/solid/solid/backends/udisks2/udisksmanager.cpp b/solid/solid/backends/udisks2/udisksmanager.cpp
index ecb9add..a73cb32 100644
--- a/solid/solid/backends/udisks2/udisksmanager.cpp
+++ b/solid/solid/backends/udisks2/udisksmanager.cpp
@@ -203,6 +203,10 @@ void Manager::slotInterfacesAdded(const QDBusObjectPath &object_path, const QVar
m_deviceCache.append(udi);
Q_EMIT deviceAdded(udi);
}
@ -12,3 +13,12 @@ diff -up kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp.udisks2_2
}
void Manager::slotInterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &interfaces)
@@ -222,7 +222,7 @@ void Manager::slotInterfacesRemoved(const QDBusObjectPath &object_path, const QS
Device device(udi);
- if (!udi.isEmpty() && (interfaces.isEmpty() || device.interfaces().isEmpty() || device.interfaces().contains(UD2_DBUS_INTERFACE_FILESYSTEM))) {
+ if (!udi.isEmpty() && (interfaces.isEmpty() || device.interfaces().isEmpty() || interfaces.contains(UD2_DBUS_INTERFACE_FILESYSTEM))) {
Q_EMIT deviceRemoved(udi);
m_deviceCache.removeAll(udi);
DeviceBackend::destroyBackend(udi);

5
kdelibs.spec
View File

@ -23,7 +23,7 @@
Summary: KDE Libraries
Version: 4.10.0
Release: 2%{?dist}
Release: 3%{?dist}
Name: kdelibs
Epoch: 6
@ -555,6 +555,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%changelog
* Thu Feb 07 2013 Lukáš Tinkl <ltinkl@redhat.com> 6:4.10.0-3
- complete kdelibs-udisks2_2_stage.patch
* Tue Feb 05 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.10.0-2
- kdelibs-udisks2_2_stage.patch (fix for some phones/mtp-device detection)