diff options
Diffstat (limited to 'sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp')
| -rw-r--r-- | sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp b/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp index 934ccf2268c8..a839f7e2a930 100644 --- a/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp +++ b/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp @@ -1,5 +1,5 @@ ---- src/device/k3bdevicemanager.cpp.orig Tue Jun 22 21:50:55 2004 -+++ src/device/k3bdevicemanager.cpp Sun Jul 11 12:24:22 2004 +--- src/device/k3bdevicemanager.cpp.orig Sat Jul 17 11:50:08 2004 ++++ src/device/k3bdevicemanager.cpp Sun Aug 22 15:28:36 2004 @@ -49,6 +49,12 @@ #include <sys/stat.h> #include <sys/ioctl.h> @@ -35,7 +35,7 @@ scanFstab(); return m_foundDevices; -@@ -421,6 +435,7 @@ +@@ -423,6 +437,7 @@ bool K3bCdDevice::DeviceManager::testForCdrom(const QString& devicename) { bool ret = false; @@ -43,7 +43,7 @@ int cdromfd = K3bCdDevice::openDevice( devicename.ascii() ); if (cdromfd < 0) { kdDebug() << "could not open device " << devicename << " (" << strerror(errno) << ")" << endl; -@@ -461,11 +476,36 @@ +@@ -463,11 +478,36 @@ } ::close( cdromfd ); @@ -80,7 +80,7 @@ K3bDevice* device = 0; // resolve all symlinks -@@ -497,6 +537,7 @@ +@@ -499,6 +539,7 @@ device->m_target = target; device->m_lun = lun; } @@ -88,7 +88,7 @@ if( !device->init() ) { kdDebug() << "Could not initialize device " << devicename << endl; -@@ -572,9 +613,20 @@ +@@ -574,9 +615,20 @@ if( K3bDevice* dev = findDevice( resolveSymLink(md) ) ) { @@ -109,7 +109,7 @@ dev->setMountDevice( md ); dev->m_supermount = supermount; } -@@ -583,6 +635,8 @@ +@@ -585,6 +637,8 @@ { // compare bus, id, lun since the same device can for example be // determined as /dev/srX or /dev/scdX @@ -118,7 +118,7 @@ int bus = -1, id = -1, lun = -1; if( determineBusIdLun( mountInfo->fs_spec, bus, id, lun ) ) { if( K3bDevice* dev = findDevice( bus, id, lun ) ) { -@@ -593,6 +647,17 @@ +@@ -595,6 +649,17 @@ } } } @@ -136,7 +136,7 @@ } -@@ -668,5 +733,131 @@ +@@ -670,5 +735,131 @@ return QString::fromLatin1( resolved ); } |