[Xfce4-commits] <xfce4-mount-plugin:master> explicit fuser-un-mount support

[Fabian]

Updating branch refs/heads/master
         to ab6e7bad5da07324fa6e51ad18c3fd7bbe3af40f (commit)
       from 4886b33d4fb2394fc158e9ad34997af67cac759b (commit)

commit ab6e7bad5da07324fa6e51ad18c3fd7bbe3af40f
Author: Fabian <timystery at arcor.de>
Date:   Mon May 14 15:02:58 2012 +0200

    explicit fuser-un-mount support

 panel-plugin/devices.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/devices.c b/panel-plugin/devices.c
index f320895..1cf7734 100644
--- a/panel-plugin/devices.c
+++ b/panel-plugin/devices.c
@@ -325,8 +325,12 @@ disk_umount (t_disk *pdisk, char* umount_command, gboolean show_message_dialog,
     if (pdisk != NULL)
     {
 
-        DBG("disk_umount: dev=%s, mountpoint=%s, umount_command=%s, show_message_dialog=%d, eject=%d", pdisk->device, pdisk->mount_point, umount_command, show_message_dialog, eject);
-        deviceprintf(&tmp, umount_command, pdisk->device);
+        DBG("disk_umount: dev=%s, mountpoint=%s, umount_command=%s, show_message_dialog=%d, eject=%d, type=%s", pdisk->device, pdisk->mount_point, umount_command, show_message_dialog, eject, pdisk->mount_info->type);
+        if (strstr(pdisk->mount_info->type, "fuse"))
+          deviceprintf(&tmp, "fusermount -u %m", pdisk->device);
+        else
+          deviceprintf(&tmp, umount_command, pdisk->device);
+        
         mountpointprintf(&cmd, tmp, pdisk->mount_point);
         /* cmd contains umount_command device mount_point */
         val = g_spawn_command_line_sync (cmd, &output, &erroutput, &exit_status, &error);