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

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

This commit is contained in:
Rex Dieter 2012-07-13 07:29:23 -05:00
parent a1b1a94b5a
commit 91142b58ad
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kdelibs-4.8-solid_cd_eject.patch Normal file
View File

@ -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();

9
kdelibs.spec
View File

@ -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@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@fedoraproject.org> - 6:4.8.97-3
- provide /usr/bin/kmailservice (#773414)