[Patch] Properly fall back to mount command selection if not using the hal mount/unmount command



Hi,

  If hal is enabled, but the hal mount command is not used (because there is no
  hal-udi avail) gnome-vfs currently falls back to just the MOUNT_COMMAND.
  While it should fallback to the same behaviour when no hal mount command is
  specified. 

  Attached patch fixes this by removing the extra fallback code that is 
  enabled when HAL_MOUNT is defined. So the fallback becomes  exactly the same 
  as when HAL_MOUNT isn't defined.

  Sjoerd
-- 
You can't push on a string.
? libgnomevfs/.gnome-vfs-volume-ops.c.swp
Index: libgnomevfs/gnome-vfs-volume-ops.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-volume-ops.c,v
retrieving revision 1.31
diff -u -r1.31 gnome-vfs-volume-ops.c
--- libgnomevfs/gnome-vfs-volume-ops.c	25 Apr 2006 11:19:53 -0000	1.31
+++ libgnomevfs/gnome-vfs-volume-ops.c	1 May 2006 17:29:27 -0000
@@ -833,8 +833,6 @@
 # if defined(HAL_MOUNT)
 		       if (hal_udi != NULL && g_file_test (HAL_MOUNT, G_FILE_TEST_IS_EXECUTABLE))
 			       command = HAL_MOUNT;
-		       else
-			       command = find_command (MOUNT_COMMAND);
 # else
 		       ;
 # endif
@@ -857,8 +855,6 @@
 # if defined(HAL_UMOUNT)
 		       if (hal_udi != NULL && g_file_test (HAL_UMOUNT, G_FILE_TEST_IS_EXECUTABLE))
 			       command = HAL_UMOUNT;
-		       else
-			       command = find_command (UMOUNT_COMMAND);
 # else
 		       ;
 #endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]