f-spot r4655 - in trunk: . src tools

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Fri Dec  5 10:02:16 2008
New Revision: 4655
URL: http://svn.gnome.org/viewvc/f-spot?rev=4655&view=rev

Log:
import from both mass-storage and [PM]TP

2008-12-05  Stephane Delcroix  <sdelcroix novell com>

	* src/Core.cs:
	* tools/f-spot-import: fixes for latest changes in natuilus

Modified:
   trunk/ChangeLog
   trunk/src/Core.cs
   trunk/tools/f-spot-import

Modified: trunk/src/Core.cs
==============================================================================
--- trunk/src/Core.cs	(original)
+++ trunk/src/Core.cs	Fri Dec  5 10:02:16 2008
@@ -99,7 +99,10 @@
 			{
 				if (path != null && path.StartsWith ("gphoto2:"))
 					main.ImportCamera (path);
-				else
+				else if (path != null && path.StartsWith ("file:")) {
+					Uri uri = new Uri (path);
+					main.ImportFile (Uri.UnescapeDataString (uri.AbsolutePath));
+				} else
 					main.ImportFile (path);
 				
 				return false;

Modified: trunk/tools/f-spot-import
==============================================================================
--- trunk/tools/f-spot-import	(original)
+++ trunk/tools/f-spot-import	Fri Dec  5 10:02:16 2008
@@ -5,13 +5,14 @@
 
 if [ "$udi" != "${udi#gphoto2:}" ]; then
 	# gphoto2, as passed by gvfs/nautilus
+	gvfs-mount -u "$udi" || true
 	f-spot --import "$udi"
 	exit
 fi
 mnt=${udi#file://}
 if [ "$udi" != "$mnt" ]; then
 	# mount point, as passed by gvfs/nautilus.
-	f-spot --import "$mnt"
+	f-spot --import "$udi"
 	exit
 fi
 mount_point=`hal-get-property --udi="$udi" --key=volume.mount_point` || true