[f-spot] Fix build breakages missed by bad rebuilds.

[Ruben Vermeersch <rubenv src gnome org>]

commit 872a038b9dd5aefb9bdefa806cae4b7c55be9da9
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sun May 16 09:15:31 2010 +0200

    Fix build breakages missed by bad rebuilds.

 extensions/Exporters/FolderExport/FolderExport.cs |    2 +-
 extensions/Services/DBusService/DBusProxy.cs      |    2 +-
 extensions/Tools/MergeDb/MergeDb.cs               |    2 +-
 src/FileImportBackend.cs                          |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/extensions/Exporters/FolderExport/FolderExport.cs b/extensions/Exporters/FolderExport/FolderExport.cs
index 60b5305..06dd22e 100644
--- a/extensions/Exporters/FolderExport/FolderExport.cs
+++ b/extensions/Exporters/FolderExport/FolderExport.cs
@@ -514,7 +514,7 @@ namespace FSpotFolderExport {
 
 		protected virtual string ImageName (int image_num)
 		{
-			return System.IO.Path.GetFileName(FileImportBackend.UniqueName(gallery_path, System.IO.Path.GetFileName (collection [image_num].DefaultVersionUri.LocalPath)));
+			return System.IO.Path.GetFileName(FileImportBackend.UniqueName(gallery_path, System.IO.Path.GetFileName (collection [image_num].DefaultVersionUri.LocalPath)).AbsolutePath);
 		}
 
 		public void ProcessImage (int image_num, FilterSet filter_set)
diff --git a/extensions/Services/DBusService/DBusProxy.cs b/extensions/Services/DBusService/DBusProxy.cs
index 75806ac..5f5813a 100644
--- a/extensions/Services/DBusService/DBusProxy.cs
+++ b/extensions/Services/DBusService/DBusProxy.cs
@@ -419,7 +419,7 @@ namespace DBusService {
 				string new_path = path;
 
 				if (copy)
-					new_path = FileImportBackend.ChooseLocation (path);
+					new_path = FileImportBackend.ChooseLocation (UriUtils.PathToFileUri (path)).AbsolutePath;
 
 				if (new_path != path)
 					System.IO.File.Copy (path, new_path);
diff --git a/extensions/Tools/MergeDb/MergeDb.cs b/extensions/Tools/MergeDb/MergeDb.cs
index 50b90bf..4651b46 100644
--- a/extensions/Tools/MergeDb/MergeDb.cs
+++ b/extensions/Tools/MergeDb/MergeDb.cs
@@ -232,7 +232,7 @@ namespace MergeDbExtension
 			Photo newp;
 
 			if (copy)
-				destination = FileImportBackend.ChooseLocation (photo_path, null);
+				destination = FileImportBackend.ChooseLocation (UriUtils.PathToFileUri (photo_path)).AbsolutePath;
 			else
 				destination = photo_path;
 
diff --git a/src/FileImportBackend.cs b/src/FileImportBackend.cs
index 5be6ad4..7f7bd45 100644
--- a/src/FileImportBackend.cs
+++ b/src/FileImportBackend.cs
@@ -86,7 +86,7 @@ public class FileImportBackend : ImportBackend {
 	}
 	
 
-	static Uri UniqueName (string path, string filename)
+	public static Uri UniqueName (string path, string filename)
 	{
 		int i = 1;
 		string dest = System.IO.Path.Combine (path, filename);