[f-spot: 2/3] fixing extension affected by previos cleanups

[Stephane Delcroix <sdelcroix src gnome org>]

commit 3c05d46f10f13aedfea4969050b04ef882dfe84d
Author: Mike Gemünde <mike gemuende de>
Date:   Sat Jul 4 15:29:19 2009 +0200

    fixing extension affected by previos cleanups

 extensions/Exporters/FlickrExport/FlickrExport.cs  |   63 ++++++++++----------
 extensions/Exporters/FolderExport/FolderExport.cs  |   43 ++++++--------
 .../Exporters/GalleryExport/GalleryExport.cs       |   30 ++++------
 .../Exporters/PicasaWebExport/PicasaWebExport.cs   |   25 +++-----
 .../Exporters/SmugMugExport/SmugMugExport.cs       |   23 +++-----
 extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs  |   13 +---
 extensions/Tools/MergeDb/MergeDb.cs                |    4 +-
 7 files changed, 83 insertions(+), 118 deletions(-)
---
diff --git a/extensions/Exporters/FlickrExport/FlickrExport.cs b/extensions/Exporters/FlickrExport/FlickrExport.cs
index 4e23a44..2335c55 100644
--- a/extensions/Exporters/FlickrExport/FlickrExport.cs
+++ b/extensions/Exporters/FlickrExport/FlickrExport.cs
@@ -494,61 +494,60 @@ namespace FSpotFlickrExport {
 
 		void LoadPreference (string key)
 		{
-			object val = Preferences.Get (key);
-
-			if (val == null)
-				return;
-
-			//System.Console.WriteLine("Setting {0} to {1}", key, val);
-			bool active;
-
 			switch (key) {
 			case SCALE_KEY:
-				if (scale_check.Active != (bool) val)
-					scale_check.Active = (bool) val;
+				if (scale_check.Active != Preferences.Get<bool> (key))
+					scale_check.Active = Preferences.Get<bool> (key);
 				break;
+				
 			case SIZE_KEY:
-				size_spin.Value = (double) (int) val;
+				size_spin.Value = (double) Preferences.Get<int> (key);
 				break;
+				
 			case BROWSER_KEY:
-				if (open_check.Active != (bool) val)
-					open_check.Active = (bool) val;
+				if (open_check.Active != Preferences.Get<bool> (key))
+					open_check.Active = Preferences.Get<bool> (key);
 				break;
+				
 			case TAGS_KEY:
-				if (tag_check.Active != (bool) val)
-					tag_check.Active = (bool) val;
+				if (tag_check.Active != Preferences.Get<bool> (key))
+					tag_check.Active = Preferences.Get<bool> (key);
 				break;
+				
 			case TAG_HIERARCHY_KEY:
-				if (hierarchy_check.Active != (bool) val)
-					hierarchy_check.Active = (bool) val;
+				if (hierarchy_check.Active != Preferences.Get<bool> (key))
+					hierarchy_check.Active = Preferences.Get<bool> (key);
 				break;
+				
 			case IGNORE_TOP_LEVEL_KEY:
-				if (ignore_top_level_check.Active != (bool) val)
-					ignore_top_level_check.Active = (bool) val;
+				if (ignore_top_level_check.Active != Preferences.Get<bool> (key))
+					ignore_top_level_check.Active = Preferences.Get<bool> (key);
 				break;
+				
 			case STRIP_META_KEY:
-				if (meta_check.Active != (bool) val)
-					meta_check.Active = (bool) val;
+				if (meta_check.Active != Preferences.Get<bool> (key))
+					meta_check.Active = Preferences.Get<bool> (key);
 				break;
+				
 			case FlickrRemote.TOKEN_FLICKR:
 			case FlickrRemote.TOKEN_23HQ:
 			case FlickrRemote.TOKEN_ZOOOMR:
-				token = (string) val;
-			        break;
+				token = Preferences.Get<string> (key);
+				break;
+				
 			case PUBLIC_KEY:
-				active = (bool) val;
-				if (public_radio.Active != active)
-					public_radio.Active = active;
+				if (public_radio.Active != Preferences.Get<bool> (key))
+					public_radio.Active = Preferences.Get<bool> (key);
 				break;
+				
 			case FAMILY_KEY:
-				active = (bool) val;
-				if (family_check.Active != active)
-					family_check.Active = active;
+				if (family_check.Active != Preferences.Get<bool> (key))
+					family_check.Active = Preferences.Get<bool> (key);
 				break;
+				
 			case FRIENDS_KEY:
-				active = (bool) val;
-				if (friend_check.Active != active)
-					friend_check.Active = active;
+				if (friend_check.Active != Preferences.Get<bool> (key))
+					friend_check.Active = Preferences.Get<bool> (key);
 				break;
 				/*
 			case Preferences.EXPORT_FLICKR_EMAIL:
diff --git a/extensions/Exporters/FolderExport/FolderExport.cs b/extensions/Exporters/FolderExport/FolderExport.cs
index da75d8c..c629904 100644
--- a/extensions/Exporters/FolderExport/FolderExport.cs
+++ b/extensions/Exporters/FolderExport/FolderExport.cs
@@ -142,8 +142,8 @@ namespace FSpotFolderExport {
 
 			uri_chooser.LocalOnly = false;
 
-			if (Preferences.Get (URI_KEY) != null && Preferences.Get (URI_KEY) as string != String.Empty)
-				uri_chooser.SetUri (Preferences.Get (URI_KEY) as string);
+			if (Preferences.Get<string> (URI_KEY) != String.Empty)
+				uri_chooser.SetUri (Preferences.Get<string> (URI_KEY));
 			else
 				uri_chooser.SetFilename (uri_path);
 
@@ -259,7 +259,7 @@ namespace FSpotFolderExport {
 				if (gallery is OriginalGallery) {
 					bool include_tarballs;
 					try {
-						include_tarballs = (bool)Preferences.Get (INCLUDE_TARBALLS_KEY);
+						include_tarballs = Preferences.Get<bool> (INCLUDE_TARBALLS_KEY);
 					} catch (NullReferenceException){
 						include_tarballs = true;
 						Preferences.Set (INCLUDE_TARBALLS_KEY, true);
@@ -402,47 +402,40 @@ namespace FSpotFolderExport {
 
 		void LoadPreference (string key)
 		{
-			object val = Preferences.Get (key);
-
-			if (val == null)
-				return;
-
-			//System.Console.WriteLine ("Setting {0} to {1}", key, val);
-
 			switch (key) {
 			case SCALE_KEY:
-				if (scale_check.Active != (bool) val)
-					scale_check.Active = (bool) val;
+				if (scale_check.Active != Preferences.Get<bool> (key))
+					scale_check.Active = Preferences.Get<bool> (key);
 				break;
 
 			case SIZE_KEY:
-				size_spin.Value = (double) (int) val;
+				size_spin.Value = (double) Preferences.Get<int> (key);
 				break;
 
 			case OPEN_KEY:
-				if (open_check.Active != (bool) val)
-					open_check.Active = (bool) val;
+				if (open_check.Active != Preferences.Get<bool> (key))
+					open_check.Active = Preferences.Get<bool> (key);
 				break;
 
 			case ROTATE_KEY:
-				if (rotate_check.Active != (bool) val)
-					rotate_check.Active = (bool) val;
+				if (rotate_check.Active != Preferences.Get<bool> (key))
+					rotate_check.Active = Preferences.Get<bool> (key);
 				break;
 
 			case EXPORT_TAGS_KEY:
-				if (export_tags_check.Active != (bool) val)
-					export_tags_check.Active = (bool) val;
+				if (export_tags_check.Active != Preferences.Get<bool> (key))
+					export_tags_check.Active = Preferences.Get<bool> (key);
 				break;
 
 			case EXPORT_TAG_ICONS_KEY:
-				if (export_tag_icons_check.Active != (bool) val)
-					export_tag_icons_check.Active = (bool) val;
+				if (export_tag_icons_check.Active != Preferences.Get<bool> (key))
+					export_tag_icons_check.Active = Preferences.Get<bool> (key);
 				break;
 
 			case METHOD_KEY:
-				static_radio.Active = (string) val == "static";
-				original_radio.Active = (string) val == "original";
-				plain_radio.Active = (string) val == "folder";
+				static_radio.Active = (Preferences.Get<string> (key) == "static");
+				original_radio.Active = (Preferences.Get<string> (key) == "original");
+				plain_radio.Active = (Preferences.Get<string> (key) == "folder");
 				break;
 			}
 		}
@@ -559,7 +552,7 @@ namespace FSpotFolderExport {
 
 						bool sharpen;
 						try {
-							sharpen = (bool)Preferences.Get (FolderExport.SHARPEN_KEY);
+							sharpen = Preferences.Get<bool> (FolderExport.SHARPEN_KEY);
 						} catch (NullReferenceException) {
 							sharpen = true;
 							Preferences.Set (FolderExport.SHARPEN_KEY, true);
diff --git a/extensions/Exporters/GalleryExport/GalleryExport.cs b/extensions/Exporters/GalleryExport/GalleryExport.cs
index 8572930..48474b5 100644
--- a/extensions/Exporters/GalleryExport/GalleryExport.cs
+++ b/extensions/Exporters/GalleryExport/GalleryExport.cs
@@ -59,9 +59,7 @@ namespace G2Export {
 			gallery = gal;
 			connected = true;
 
-			object val = Preferences.Get (LIGHTTPD_WORKAROUND_KEY);
-			if (val != null)
-				gallery.expect_continue = !(bool)val;
+			gallery.expect_continue = Preferences.Get<bool> (LIGHTTPD_WORKAROUND_KEY);
 
 			return gallery;
 		}
@@ -975,35 +973,29 @@ namespace G2Export {
 
 		void LoadPreference (string key)
 		{
-			object val = Preferences.Get (key);
-
-			if (val == null)
-				return;
-
-			//System.Console.WriteLine ("Setting {0} to {1}", key, val);
-
 			switch (key) {
 			case SCALE_KEY:
-				if (scale_check.Active != (bool) val)
-					scale_check.Active = (bool) val;
+				if (scale_check.Active != Preferences.Get<bool> (key))
+					scale_check.Active = Preferences.Get<bool> (key);
 				break;
 
 			case SIZE_KEY:
-				size_spin.Value = (double) (int) val;
+				size_spin.Value = (double) Preferences.Get<int> (key);
 				break;
 
 			case BROWSER_KEY:
-				if (browser_check.Active != (bool) val)
-					browser_check.Active = (bool) val;
+				if (browser_check.Active != Preferences.Get<bool> (key))
+					browser_check.Active = Preferences.Get<bool> (key);
 				break;
 
 			case META_KEY:
-				if (meta_check.Active != (bool) val)
-					meta_check.Active = (bool) val;
+				if (meta_check.Active != Preferences.Get<bool> (key))
+					meta_check.Active = Preferences.Get<bool> (key);
 				break;
+				
 			case ROTATE_KEY:
-				if (rotate_check.Active != (bool) val)
-					rotate_check.Active = (bool) val;
+				if (rotate_check.Active != Preferences.Get<bool> (key))
+					rotate_check.Active = Preferences.Get<bool> (key);
 				break;
 			}
 		}
diff --git a/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs b/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
index 0454688..6e2d3fc 100644
--- a/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
+++ b/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
@@ -919,31 +919,26 @@ namespace FSpotGoogleExport {
 
 		void LoadPreference (string key)
 		{
-			object val = Preferences.Get (key);
-
-			if (val == null)
-				return;
-
 			switch (key) {
 			case SCALE_KEY:
-				if (scale_check.Active != (bool) val) {
-					scale_check.Active = (bool) val;
-					rotate_check.Sensitive = !(bool) val;
+				if (scale_check.Active != Preferences.Get<bool> (key)) {
+					scale_check.Active = Preferences.Get<bool> (key);
+					rotate_check.Sensitive = ! Preferences.Get<bool> (key);
 				}
 				break;
 
 			case SIZE_KEY:
-				size_spin.Value = (double) (int) val;
+				size_spin.Value = (double) Preferences.Get<int> (key);
 				break;
 
 			case BROWSER_KEY:
-				if (browser_check.Active != (bool) val)
-					browser_check.Active = (bool) val;
+				if (browser_check.Active != Preferences.Get<bool> (key))
+					browser_check.Active = Preferences.Get<bool> (key);
 				break;
 
 			case ROTATE_KEY:
-				if (rotate_check.Active != (bool) val)
-					rotate_check.Active = (bool) val;
+				if (rotate_check.Active != Preferences.Get<bool> (key))
+					rotate_check.Active = Preferences.Get<bool> (key);
 				break;
 
 //			case Preferences.EXPORT_GALLERY_META:
@@ -952,8 +947,8 @@ namespace FSpotGoogleExport {
 //				break;
 
 			case TAG_KEY:
-				if (tag_check.Active != (bool) val)
-					tag_check.Active = (bool) val;
+				if (tag_check.Active != Preferences.Get<bool> (key))
+					tag_check.Active = Preferences.Get<bool> (key);
 				break;
 			}
 		}
diff --git a/extensions/Exporters/SmugMugExport/SmugMugExport.cs b/extensions/Exporters/SmugMugExport/SmugMugExport.cs
index 75a3826..c0987ea 100644
--- a/extensions/Exporters/SmugMugExport/SmugMugExport.cs
+++ b/extensions/Exporters/SmugMugExport/SmugMugExport.cs
@@ -772,33 +772,26 @@ namespace FSpotSmugMugExport {
 
 		void LoadPreference (string key)
 		{
-			object val = Preferences.Get (key);
-
-			if (val == null)
-				return;
-
-			//System.Console.WriteLine ("Setting {0} to {1}", key, val);
-
 			switch (key) {
 			case SCALE_KEY:
-				if (scale_check.Active != (bool) val) {
-					scale_check.Active = (bool) val;
-					rotate_check.Sensitive = !(bool) val;
+				if (scale_check.Active != Preferences.Get<bool> (key)) {
+					scale_check.Active = Preferences.Get<bool> (key);
+					rotate_check.Sensitive = !Preferences.Get<bool> (key);
 				}
 				break;
 
 			case SIZE_KEY:
-				size_spin.Value = (double) (int) val;
+				size_spin.Value = (double) Preferences.Get<int> (key);
 				break;
 
 			case BROWSER_KEY:
-				if (browser_check.Active != (bool) val)
-					browser_check.Active = (bool) val;
+				if (browser_check.Active != Preferences.Get<bool> (key))
+					browser_check.Active = Preferences.Get<bool> (key);
 				break;
 
 			case ROTATE_KEY:
-				if (rotate_check.Active != (bool) val)
-					rotate_check.Active = (bool) val;
+				if (rotate_check.Active != Preferences.Get<bool> (key))
+					rotate_check.Active = Preferences.Get<bool> (key);
 				break;
 			}
 		}
diff --git a/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs b/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs
index 796a7f9..1a361b4 100644
--- a/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs
+++ b/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs
@@ -182,22 +182,15 @@ namespace DevelopInUFRawExtension
 
 		void LoadPreference (string key)
 		{
-			object val = Preferences.Get (key);
-
-			if (val == null)
-				return;
-
-			Log.Debug (String.Format ("Setting {0} to {1}", key, val));
-
 			switch (key) {
 				case UFRAW_JPEG_QUALITY_KEY:
-					ufraw_jpeg_quality = (int) val;
+					ufraw_jpeg_quality = Preferences.Get<int> (key);
 					break;
 				case UFRAW_ARGUMENTS_KEY:
-					ufraw_args = (string) val;
+					ufraw_args = Preferences.Get<string> (key);
 					break;
 				case UFRAW_BATCH_ARGUMENTS_KEY:
-					ufraw_batch_args = (string) val;
+					ufraw_batch_args = Preferences.Get<string> (key);
 					break;
 			}
 		}
diff --git a/extensions/Tools/MergeDb/MergeDb.cs b/extensions/Tools/MergeDb/MergeDb.cs
index 3f0d606..3f43cbb 100644
--- a/extensions/Tools/MergeDb/MergeDb.cs
+++ b/extensions/Tools/MergeDb/MergeDb.cs
@@ -239,11 +239,11 @@ namespace MergeDbExtension
 
 			// Don't copy if we are already home
 			if (photo_path == destination)
-				newp = to_store.Create (destination, roll_map [photo.RollId], out pixbuf);
+				newp = to_store.Create (UriUtils.PathToFileUri (destination), roll_map [photo.RollId], out pixbuf);
 			else {
 				System.IO.File.Copy (photo_path, destination);
 
-				newp = to_store.Create (destination, photo_path, roll_map [photo.RollId], out pixbuf);
+				newp = to_store.Create (UriUtils.PathToFileUri (destination), UriUtils.PathToFileUri (photo_path), roll_map [photo.RollId], out pixbuf);
 				try {
 					File.SetAttributes (destination, File.GetAttributes (destination) & ~FileAttributes.ReadOnly);
 					DateTime create = File.GetCreationTime (photo_path);