blob: 394aff152d4c0a08cad17413a514449e474da520 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
--- k3b-1.0.3/libk3b/core/k3bglobals.cpp.umount 2007-07-27 21:26:30.000000000 +0200
+++ k3b-1.0.3/libk3b/core/k3bglobals.cpp 2007-07-27 21:31:26.000000000 +0200
@@ -569,7 +569,24 @@
return true;
}
- // now try pmount
+#ifdef HAVE_HAL
+ if (!K3bDevice::HalConnection::instance()->unmount( dev ))
+ return true;
+#endif
+
+ QString gumountBin = K3b::findExe( "gnome-umount" );
+ if( !gumountBin.isEmpty() ) {
+ KProcess p;
+ p << gumountBin;
+ p << "-u";
+ p << "-d";
+ p << dev->blockDeviceName();
+ p.start( KProcess::Block );
+ if( !p.exitStatus() )
+ return true;
+ }
+
+// now try pmount
QString pumountBin = K3b::findExe( "pumount" );
if( !pumountBin.isEmpty() ) {
KProcess p;
@@ -577,15 +592,11 @@
p << "-l"; // lazy unmount
p << dev->blockDeviceName();
p.start( KProcess::Block );
- return !p.exitStatus();
- }
- else {
-#ifdef HAVE_HAL
- return !K3bDevice::HalConnection::instance()->unmount( dev );
-#else
- return false;
-#endif
+ if( !p.exitStatus() )
+ return true;
}
+
+ return false;
}
|
