f-spot r4570 - trunk/tools

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue Nov  4 16:46:11 2008
New Revision: 4570
URL: http://svn.gnome.org/viewvc/f-spot?rev=4570&view=rev

Log:
patch from Martin Pitt for f-spot-import

Modified:
   trunk/tools/f-spot-import

Modified: trunk/tools/f-spot-import
==============================================================================
--- trunk/tools/f-spot-import	(original)
+++ trunk/tools/f-spot-import	Tue Nov  4 16:46:11 2008
@@ -4,10 +4,16 @@
 #xmessage $udi
 
 if [ "$udi" != "${udi#gphoto2:}" ]; then
-	# gphoto2, as passed by nautilus.
+	# gphoto2, as passed by gvfs/nautilus
 	f-spot --import "$udi"
 	exit
 fi
+mnt=${udi#file://}
+if [ "$udi" != "$mnt" ]; then
+	# mount point, as passed by gvfs/nautilus.
+	f-spot --import "$mnt"
+	exit
+fi
 mount_point=`hal-get-property --udi="$udi" --key=volume.mount_point` || true
 if [ -n "$mount_point" ]; then
 	# USB Mass Storage camera: need to pass f-spot a mount point