56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
|
diff -Nru clementine-0.7.1.orig/src/devices/giolister.cpp clementine-0.7.1/src/devices/giolister.cpp
|
||
|
|
--- clementine-0.7.1.orig/src/devices/giolister.cpp 2011-03-29 21:23:34.000000000 +0200
|
||
|
|
+++ clementine-0.7.1/src/devices/giolister.cpp 2011-11-10 06:00:35.671356613 +0100
|
||
|
|
@@ -458,19 +458,34 @@
|
||
|
|
|
||
|
|
if (info.volume) {
|
||
|
|
if (g_volume_can_eject(info.volume)) {
|
||
|
|
- g_volume_eject(info.volume, G_MOUNT_UNMOUNT_NONE, NULL,
|
||
|
|
- (GAsyncReadyCallback) VolumeEjectFinished, NULL);
|
||
|
|
+ g_volume_eject_with_operation(
|
||
|
|
+ info.volume,
|
||
|
|
+ G_MOUNT_UNMOUNT_NONE,
|
||
|
|
+ NULL,
|
||
|
|
+ NULL,
|
||
|
|
+ (GAsyncReadyCallback) VolumeEjectFinished,
|
||
|
|
+ NULL);
|
||
|
|
g_object_unref(info.volume);
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
if (g_mount_can_eject(info.mount)) {
|
||
|
|
- g_mount_eject(info.mount, G_MOUNT_UNMOUNT_NONE, NULL,
|
||
|
|
- (GAsyncReadyCallback) MountEjectFinished, NULL);
|
||
|
|
+ g_mount_eject_with_operation(
|
||
|
|
+ info.mount,
|
||
|
|
+ G_MOUNT_UNMOUNT_NONE,
|
||
|
|
+ NULL,
|
||
|
|
+ NULL,
|
||
|
|
+ (GAsyncReadyCallback) MountEjectFinished,
|
||
|
|
+ NULL);
|
||
|
|
} else if (g_mount_can_unmount(info.mount)) {
|
||
|
|
- g_mount_unmount(info.mount, G_MOUNT_UNMOUNT_NONE, NULL,
|
||
|
|
- (GAsyncReadyCallback) MountUnmountFinished, NULL);
|
||
|
|
+ g_mount_unmount_with_operation(
|
||
|
|
+ info.mount,
|
||
|
|
+ G_MOUNT_UNMOUNT_NONE,
|
||
|
|
+ NULL,
|
||
|
|
+ NULL,
|
||
|
|
+ (GAsyncReadyCallback) MountUnmountFinished,
|
||
|
|
+ NULL);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
--- clementine-0.7.1.orig/src/main.cpp 2011-03-29 21:16:24.000000000 +0200
|
||
|
|
+++ clementine-0.7.1/src/main.cpp 2011-11-10 06:16:27.777883663 +0100
|
||
|
|
@@ -61,7 +61,7 @@
|
||
|
|
#include <QtDebug>
|
||
|
|
|
||
|
|
#include <glib-object.h>
|
||
|
|
-#include <glib/gutils.h>
|
||
|
|
+#include <glib.h>
|
||
|
|
#include <gst/gst.h>
|
||
|
|
|
||
|
|
#include <boost/scoped_ptr.hpp>
|