diff -ru xfdesktop4-4.4.2.orig/src/xfdesktop-volume-icon.c xfdesktop4-4.4.2/src/xfdesktop-volume-icon.c

--- xfdesktop4-4.4.2.orig/src/xfdesktop-volume-icon.c	2007-11-17 20:31:41.000000000 +0100

+++ xfdesktop4-4.4.2/src/xfdesktop-volume-icon.c	2007-12-12 01:07:27.421327344 +0100

@@ -562,19 +562,7 @@

                          icon);

     }

-    mi = gtk_image_menu_item_new_with_mnemonic(_("_Unmount Volume"));

-    gtk_widget_show(mi);

-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);

-    if(!thunar_vfs_volume_is_mounted(volume))

-        gtk_widget_set_sensitive(mi, FALSE);

-    else {

-        g_signal_connect(G_OBJECT(mi), "activate",

-                         G_CALLBACK(xfdesktop_volume_icon_menu_toggle_mount),

-                         icon);

-    }

-    

-    if(thunar_vfs_volume_is_disc(volume)

-       && thunar_vfs_volume_is_ejectable(volume))

+    if(thunar_vfs_volume_is_ejectable(volume))

     {

         mi = gtk_image_menu_item_new_with_mnemonic(_("E_ject Volume"));

         gtk_widget_show(mi);

@@ -582,6 +570,17 @@

         g_signal_connect(G_OBJECT(mi), "activate",

                          G_CALLBACK(xfdesktop_volume_icon_menu_eject),

                          icon);

+    } else {

+	mi = gtk_image_menu_item_new_with_mnemonic(_("_Unmount Volume"));

+	gtk_widget_show(mi);

+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);

+	if(!thunar_vfs_volume_is_mounted(volume))

+	    gtk_widget_set_sensitive(mi, FALSE);

+	else {

+	    g_signal_connect(G_OBJECT(mi), "activate",

+			     G_CALLBACK(xfdesktop_volume_icon_menu_toggle_mount),

+			     icon);

+	}

     }

     mi = gtk_separator_menu_item_new();