[kdelibs] CD drive tray goes back in after 'Eject' when dolphin is running (kde#296657, #811609)

[Rex Dieter]

commit 91142b58ad6e6d5097a41edd8c105a32d5c51b6c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 13 07:29:23 2012 -0500

    CD drive tray goes back in after 'Eject' when dolphin is running (kde#296657, #811609)

 kdelibs-4.8-solid_cd_eject.patch |   13 +++++++++++++
 kdelibs.spec                     |    9 +++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/kdelibs-4.8-solid_cd_eject.patch b/kdelibs-4.8-solid_cd_eject.patch
new file mode 100644
index 0000000..f3809cc
--- /dev/null
+++ b/kdelibs-4.8-solid_cd_eject.patch
@@ -0,0 +1,13 @@
+--- a/solid/solid/backends/udisks/udisksstorageaccess.cpp	
++++ a/solid/solid/backends/udisks/udisksstorageaccess.cpp	
+@@ -172,7 +172,9 @@ void UDisksStorageAccess::slotDBusReply( const QDBusMessage & reply )
+             m_teardownInProgress = false;
+             m_device->broadcastActionDone("teardown");
+ 
+-            if (m_device->prop("DriveIsMediaEjectable").toBool() && !m_device->prop("DeviceIsOpticalDisc").toBool()) // optical drives have their Eject method
++            if (m_device->prop("DriveIsMediaEjectable").toBool() &&
++                    m_device->prop("DeviceIsMediaAvailable").toBool() &&
++                    !m_device->prop("DeviceIsOpticalDisc").toBool()) // optical drives have their Eject method
+             {
+                 QString devnode = m_device->prop("DeviceFile").toString();
+ 
diff --git a/kdelibs.spec b/kdelibs.spec
index 31a969f..7a4e62e 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -145,6 +145,11 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch
 # return valid locale (RFC 1766)
 Patch54: kdelibs-4.8.4-kjs-locale.patch
 
+# CD drive tray goes back in after 'Eject' when dolphin is running
+# http://bugs.kde.org/296657
+# http://bugzilla.redhat.com/811609
+Patch55:  kdelibs-4.8-solid_cd_eject.patch
+
 ## upstream
 # fix kdeclarative install location (by wstephenson as found in kde-packager list)
 Patch100: kdelibs-4.8.3-kdeclarative-install-location.patch
@@ -358,6 +363,7 @@ popd
 %patch52 -p1 -b .SOLID_UPNP
 %patch53 -p1 -b .kjs-s390
 %patch54 -p1 -b .kjs-locale
+%patch55 -p1 -b .solid_cd_eject
 
 # upstream patches
 %patch100 -p1 -b .kdeclarative-install-location
@@ -622,6 +628,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 13 2012 Rex Dieter <rdieter at fedoraproject.org> - 6:4.8.97-4
+- CD drive tray goes back in after 'Eject' when dolphin is running (kde#296657, #811609)
+
 * Thu Jul 12 2012 Rex Dieter <rdieter at fedoraproject.org> - 6:4.8.97-3
 - provide /usr/bin/kmailservice (#773414)