[Goodies-commits] r2953 - in xfce4-places-plugin/trunk: . panel-plugin

[Diego Ongaro]

Author: ongardie
Date: 2007-08-05 23:48:34 +0000 (Sun, 05 Aug 2007)
New Revision: 2953

Modified:
   xfce4-places-plugin/trunk/ChangeLog
   xfce4-places-plugin/trunk/panel-plugin/model_volumes.c
Log:
2007-08-05	Diego Ongaro <ongardie at gmail.com>

* Made "Eject" actually eject



Modified: xfce4-places-plugin/trunk/ChangeLog
===================================================================
--- xfce4-places-plugin/trunk/ChangeLog	2007-08-05 22:58:21 UTC (rev 2952)
+++ xfce4-places-plugin/trunk/ChangeLog	2007-08-05 23:48:34 UTC (rev 2953)
@@ -4,6 +4,7 @@
 	* Fixed bad mount points bug.
 	* Avoid failing xfce_rc_write_entry assertion when
 	cfg->search_cmd is NULL
+	* Made "Eject" actually eject
 
 2007-07-28	Diego Ongaro <ongardie at gmail.com>
 

Modified: xfce4-places-plugin/trunk/panel-plugin/model_volumes.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/model_volumes.c	2007-08-05 22:58:21 UTC (rev 2952)
+++ xfce4-places-plugin/trunk/panel-plugin/model_volumes.c	2007-08-05 23:48:34 UTC (rev 2953)
@@ -157,8 +157,13 @@
     DBG("Unmount");
     BookmarksVolumes_Volume *priv = (BookmarksVolumes_Volume*) act->priv;
     ThunarVfsVolume *volume = priv->volume;
-    if(thunar_vfs_volume_is_mounted(volume))
-        thunar_vfs_volume_unmount(volume, NULL, NULL);
+
+    if(thunar_vfs_volume_is_mounted(volume)){
+        if(thunar_vfs_volume_is_ejectable(volume))
+            thunar_vfs_volume_eject(volume, NULL, NULL);
+        else
+            thunar_vfs_volume_unmount(volume, NULL, NULL);
+    }
 }
 
 static void
@@ -338,7 +343,7 @@
     
         if(thunar_vfs_volume_is_mounted(volume)){
 
-            if(thunar_vfs_volume_is_disc(volume))
+            if(thunar_vfs_volume_is_ejectable(volume))
                 toggle_mount->label = _("Eject Volume");
             else
                 toggle_mount->label = _("Unmount Volume");