[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/KDE/4.9] solid/solid/backends/udisks: eject the optical drive with the unmount option
From:       Lukáš Tinkl <lukas () kde ! org>
Date:       2012-11-15 15:49:13
Message-ID: 20121115154913.139A9A6091 () git ! kde ! org
[Download RAW message or body]

Git commit cd4b4377f1f989cc7e3ed088e01ae0cca1872115 by Lukáš Tinkl.
Committed on 15/11/2012 at 16:48.
Pushed by lukas into branch 'KDE/4.9'.

eject the optical drive with the unmount option

fixes #274982 - The 'eject' action only unmounts data CDs rather than
ejecting them

BUG:274982

M  +1    -9    solid/solid/backends/udisks/udisksopticaldrive.cpp

http://commits.kde.org/kdelibs/cd4b4377f1f989cc7e3ed088e01ae0cca1872115

diff --git a/solid/solid/backends/udisks/udisksopticaldrive.cpp \
b/solid/solid/backends/udisks/udisksopticaldrive.cpp index 601c842..8ea6194 100644
--- a/solid/solid/backends/udisks/udisksopticaldrive.cpp
+++ b/solid/solid/backends/udisks/udisksopticaldrive.cpp
@@ -62,16 +62,8 @@ bool UDisksOpticalDrive::eject()
 
     QString path = m_device->udi();
 
-    // check if the device is mounted and call umount if needed
-    if (m_device->prop("DeviceIsMounted").toBool())
-    {
-        QDBusMessage msg = QDBusMessage::createMethodCall(UD_DBUS_SERVICE, path, \
                UD_DBUS_INTERFACE_DISKS_DEVICE, "FilesystemUnmount");
-        msg << QStringList();   // options, unused now
-        c.call(msg, QDBus::NoBlock);
-    }
-
     QDBusMessage msg = QDBusMessage::createMethodCall(UD_DBUS_SERVICE, path, \
                UD_DBUS_INTERFACE_DISKS_DEVICE, "DriveEject");
-    msg << QStringList();
+    msg << "unmount"; // unmount parameter
     return c.callWithCallback(msg, this, SLOT(slotDBusReply(QDBusMessage)), \
SLOT(slotDBusError(QDBusError)));  }
 


[prev in list] [next in list] [prev in thread] [next in thread]