f-spot r4018 - in trunk/src: . UI.Dialog



Author: sdelcroix
Date: Fri May 30 10:33:08 2008
New Revision: 4018
URL: http://svn.gnome.org/viewvc/f-spot?rev=4018&view=rev

Log:
using the new Preferences.Get<T>

Modified:
   trunk/src/ImportCommand.cs
   trunk/src/MainWindow.cs
   trunk/src/Preferences.cs
   trunk/src/SingleView.cs
   trunk/src/UI.Dialog/LastRollDialog.cs
   trunk/src/UI.Dialog/PreferenceDialog.cs
   trunk/src/UI.Dialog/SelectionRatioDialog.cs
   trunk/src/main.cs

Modified: trunk/src/ImportCommand.cs
==============================================================================
--- trunk/src/ImportCommand.cs	(original)
+++ trunk/src/ImportCommand.cs	Fri May 30 10:33:08 2008
@@ -589,11 +589,11 @@
 		this.Dialog.WindowPosition = Gtk.WindowPosition.CenterOnParent;
 		this.Dialog.Response += HandleDialogResponse;
 
- 		if ((int) FSpot.Preferences.Get (FSpot.Preferences.IMPORT_WINDOW_WIDTH) > 0)
- 			this.Dialog.Resize ((int) FSpot.Preferences.Get (FSpot.Preferences.IMPORT_WINDOW_WIDTH), (int) FSpot.Preferences.Get(FSpot.Preferences.IMPORT_WINDOW_HEIGHT));
+ 		if (FSpot.Preferences.Get<int> (FSpot.Preferences.IMPORT_WINDOW_WIDTH) > 0)
+ 			this.Dialog.Resize (FSpot.Preferences.Get<int> (FSpot.Preferences.IMPORT_WINDOW_WIDTH), FSpot.Preferences.Get<int> (FSpot.Preferences.IMPORT_WINDOW_HEIGHT));
 
- 		if ((int) FSpot.Preferences.Get (FSpot.Preferences.IMPORT_WINDOW_PANE_POSITION) > 0)
-			import_hpaned.Position = (int) FSpot.Preferences.Get (FSpot.Preferences.IMPORT_WINDOW_PANE_POSITION);
+ 		if (FSpot.Preferences.Get<int> (FSpot.Preferences.IMPORT_WINDOW_PANE_POSITION) > 0)
+			import_hpaned.Position = FSpot.Preferences.Get<int> (FSpot.Preferences.IMPORT_WINDOW_PANE_POSITION);
 
 	        AllowFinish = false;
 		

Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs	(original)
+++ trunk/src/MainWindow.cs	Fri May 30 10:33:08 2008
@@ -360,7 +360,7 @@
 #endif
 
 		group_selector = new FSpot.GroupSelector ();
-		group_selector.Adaptor = new FSpot.TimeAdaptor (query, (bool)Preferences.Get (Preferences.GROUP_ADAPTOR_ORDER_ASC));
+		group_selector.Adaptor = new FSpot.TimeAdaptor (query, Preferences.Get<bool> (Preferences.GROUP_ADAPTOR_ORDER_ASC));
 
 		group_selector.ShowAll ();
 		
@@ -2575,16 +2575,9 @@
 
 	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 Preferences.MAIN_WINDOW_MAXIMIZED:
-			if ((bool) val)
+			if (Preferences.Get<bool> (key))
 				main_window.Maximize ();
 			else
 				main_window.Unmaximize ();
@@ -2592,61 +2585,61 @@
 
 		case Preferences.MAIN_WINDOW_X:
 		case Preferences.MAIN_WINDOW_Y:
-			main_window.Move((int) Preferences.Get(Preferences.MAIN_WINDOW_X),
-					(int) Preferences.Get(Preferences.MAIN_WINDOW_Y));
+			main_window.Move(Preferences.Get<int> (Preferences.MAIN_WINDOW_X),
+					 Preferences.Get<int> (Preferences.MAIN_WINDOW_Y));
 			break;
 		
 		case Preferences.MAIN_WINDOW_WIDTH:
 		case Preferences.MAIN_WINDOW_HEIGHT:
-			main_window.Resize((int) Preferences.Get(Preferences.MAIN_WINDOW_WIDTH),
-					(int) Preferences.Get(Preferences.MAIN_WINDOW_HEIGHT));
+			main_window.Resize(Preferences.Get<int> (Preferences.MAIN_WINDOW_WIDTH),
+					   Preferences.Get<int> (Preferences.MAIN_WINDOW_HEIGHT));
 
 			break;
 		
 		case Preferences.SHOW_TOOLBAR:
-			if (display_toolbar.Active != (bool) val)
-				display_toolbar.Active = (bool) val;
+			if (display_toolbar.Active != Preferences.Get<bool> (key))
+				display_toolbar.Active = Preferences.Get<bool> (key);
 			break;
 		
 		case Preferences.SHOW_SIDEBAR:
-			if (display_sidebar.Active != (bool) val)
-				display_sidebar.Active = (bool) val;
+			if (display_sidebar.Active != Preferences.Get<bool> (key))
+				display_sidebar.Active = Preferences.Get<bool> (key);
 			break;
 		
 		case Preferences.SHOW_TIMELINE:
-			if (display_timeline.Active != (bool) val)
-				display_timeline.Active = (bool) val;
+			if (display_timeline.Active != Preferences.Get<bool> (key))
+				display_timeline.Active = Preferences.Get<bool> (key);
 			break;
 		
 		case Preferences.SHOW_FILMSTRIP:
-			if (display_filmstrip.Active != (bool) val)
-				display_filmstrip.Active = (bool) val;
+			if (display_filmstrip.Active != Preferences.Get<bool> (key))
+				display_filmstrip.Active = Preferences.Get<bool> (key);
 			break;
 		
 		case Preferences.SHOW_TAGS:
-			if (display_tags_menu_item.Active != (bool) val)
-				display_tags_menu_item.Active = (bool) val;
+			if (display_tags_menu_item.Active != Preferences.Get<bool> (key))
+				display_tags_menu_item.Active = Preferences.Get<bool> (key);
 			break;
 		
 		case Preferences.SHOW_DATES:
-			if (display_dates_menu_item.Active != (bool) val)
-				display_dates_menu_item.Active = (bool) val;
+			if (display_dates_menu_item.Active != Preferences.Get<bool> (key))
+				display_dates_menu_item.Active = Preferences.Get<bool> (key);
 				//display_dates_menu_item.Toggle ();
 			break;
 		
 		case Preferences.SHOW_RATINGS:
-			if (display_ratings_menu_item.Active != (bool) val)
-				display_ratings_menu_item.Active = (bool) val;
+			if (display_ratings_menu_item.Active != Preferences.Get<bool> (key))
+				display_ratings_menu_item.Active = Preferences.Get<bool> (key);
 			break;
 		
 		case Preferences.GROUP_ADAPTOR:
-			if ((int) val == 1)
+			if (Preferences.Get<int> (key) == 1)
 				directory.Active = true;
 			break;
 
 		case Preferences.GROUP_ADAPTOR_ORDER_ASC:
-			group_selector.Adaptor.OrderAscending = (bool) val;
-			reverse_order.Active = (bool) val;
+			group_selector.Adaptor.OrderAscending = Preferences.Get<bool> (key);
+			reverse_order.Active = Preferences.Get<bool> (key);
 			break;
 
 		case Preferences.GLASS_POSITION:
@@ -2654,7 +2647,7 @@
 				// If the database has changed since this pref was saved, this could cause
 				// an exception to be thrown.
 				try {
-					IBrowsableItem photo = group_selector.Adaptor.PhotoFromIndex ((int) val);
+					IBrowsableItem photo = group_selector.Adaptor.PhotoFromIndex (Preferences.Get<int> (key));
 					
 					if (photo != null)
 						JumpTo (query.IndexOf (photo));
@@ -2662,8 +2655,8 @@
 			}
 			break;
 		case Preferences.SIDEBAR_POSITION:
-			if (main_hpaned.Position != (int) val)
-				main_hpaned.Position = (int) val;
+			if (main_hpaned.Position !=Preferences.Get<int> (key) )
+				main_hpaned.Position = Preferences.Get<int> (key);
 			break;
 
 		case Preferences.SIDEBAR_TOP_ENTRY:
@@ -2671,7 +2664,7 @@
 			break;
 
 		case Preferences.TAG_ICON_SIZE:
-			int s = (int) val;
+			int s = Preferences.Get<int> (key);
 			tag_icon_hidden.Active = (s == (int) Tag.IconSize.Hidden);
 			tag_icon_small.Active = (s == (int) Tag.IconSize.Small);
 			tag_icon_medium.Active = (s == (int) Tag.IconSize.Medium);
@@ -2680,14 +2673,14 @@
 			break;
 
 		case Preferences.ZOOM:
-			icon_view.Zoom = (double) val;
+			icon_view.Zoom = Preferences.Get<double> (key);
 			break;
 		
 		case Preferences.METADATA_EMBED_IN_IMAGE:
-			write_metadata = (bool) val;
+			write_metadata =Preferences.Get<bool> (key) ;
 			break;
 		case Preferences.GNOME_MAILTO_ENABLED:
-			send_mail.Visible = (bool) val;
+			send_mail.Visible = Preferences.Get<bool> (key);
 			break;
 		}
 	}

Modified: trunk/src/Preferences.cs
==============================================================================
--- trunk/src/Preferences.cs	(original)
+++ trunk/src/Preferences.cs	Fri May 30 10:33:08 2008
@@ -109,7 +109,7 @@
 		}
 		private static Dictionary<string, object> cache = new Dictionary<string, object>();
 
-		public static object GetDefault (string key)
+		static object GetDefault (string key)
 		{
 			switch (key) {
 			case MAIN_WINDOW_X:
@@ -206,14 +206,23 @@
 
 		public static T Get<T> (string key)
 		{
-					FSpot.Utils.Log.Debug (key);
-			T val;
-			try {
-				val = (T)Get (key);
-			} catch (InvalidCastException) {
-				val = (T)GetDefault (key);
+			lock (cache) {
+				T val = default (T);
+				object o;
+				if (cache.TryGetValue (key, out o)) 
+					return (T)o;
+
+				try {
+					val = (T) Backend.Get (key);
+				} catch (NoSuchKeyException) {
+					val = (T) GetDefault (key);
+				} catch (InvalidCastException) {
+					val = (T) GetDefault (key);
+				}
+				
+				cache.Add (key, val);
+				return val;
 			}
-			return val;
 		}
 
 		public static void Set (string key, object value)
@@ -248,20 +257,20 @@
 		{
 			WebProxy proxy = null;
 			
-			if ((bool) Preferences.Get (PROXY_USE_PROXY))
+			if (Preferences.Get<bool> (PROXY_USE_PROXY))
 				return null;
 
 			try {
 				string host;
 				int    port;
 				
-				host = (string) Preferences.Get (PROXY_HOST);
-				port = (int) Preferences.Get (PROXY_PORT);
+				host = Preferences.Get<string> (PROXY_HOST);
+				port = Preferences.Get<int> (PROXY_PORT);
 				
 				string uri = "http://"; + host + ":" + port.ToString ();
 				proxy = new WebProxy (uri);
 
-				string [] bypass_list = (string []) Preferences.Get (PROXY_BYPASS_LIST);
+				string [] bypass_list = Preferences.Get<string[]> (PROXY_BYPASS_LIST);
 				if (bypass_list != null) {
 					for (int i = 0; i < bypass_list.Length; i++) {
 						bypass_list [i] = "http://"; + bypass_list [i];
@@ -269,8 +278,8 @@
 					proxy.BypassList = bypass_list;
 				}
 
-				string username = (string) Preferences.Get (PROXY_USER);
-				string password = (string) Preferences.Get (PROXY_PASSWORD);
+				string username = Preferences.Get<string> (PROXY_USER);
+				string password = Preferences.Get<string> (PROXY_PASSWORD);
 
 				proxy.Credentials = new NetworkCredential (username, password);
 			} catch (Exception) {

Modified: trunk/src/SingleView.cs
==============================================================================
--- trunk/src/SingleView.cs	(original)
+++ trunk/src/SingleView.cs	Fri May 30 10:33:08 2008
@@ -538,14 +538,9 @@
 
 		void LoadPreference (String key)
 		{
-			object val = Preferences.Get (key);
-
-			if (val == null)
-				return;
-			
 			switch (key) {
 			case Preferences.VIEWER_MAXIMIZED:
-				if ((bool) val)
+				if (Preferences.Get<bool> (key))
 					window.Maximize ();
 				else
 					window.Unmaximize ();
@@ -553,43 +548,43 @@
 
 			case Preferences.VIEWER_WIDTH:
 			case Preferences.VIEWER_HEIGHT:
-				window.SetDefaultSize((int) Preferences.Get(Preferences.VIEWER_WIDTH),
-						(int) Preferences.Get(Preferences.VIEWER_HEIGHT));
+				window.SetDefaultSize(Preferences.Get<int> (Preferences.VIEWER_WIDTH),
+						      Preferences.Get<int> (Preferences.VIEWER_HEIGHT));
 
 				window.ReshowWithInitialSize();
 				break;
 			
 			case Preferences.VIEWER_SHOW_TOOLBAR:
-				if (toolbar_item.Active != (bool) val)
-					toolbar_item.Active = (bool) val;
+				if (toolbar_item.Active != Preferences.Get<bool> (key))
+					toolbar_item.Active = Preferences.Get<bool> (key);
 
-				toolbar_hbox.Visible = (bool) val;
+				toolbar_hbox.Visible = Preferences.Get<bool> (key);
 				break;
 
 			case Preferences.VIEWER_INTERPOLATION:
-				if ((bool) val)
+				if (Preferences.Get<bool> (key))
 					image_view.Interpolation = Gdk.InterpType.Bilinear;
 				else
 					image_view.Interpolation = Gdk.InterpType.Nearest;
 				break;
 
 			case Preferences.VIEWER_SHOW_FILENAMES:
-				if (filenames_item.Active != (bool) val)
-					filenames_item.Active = (bool) val;
+				if (filenames_item.Active != Preferences.Get<bool> (key))
+					filenames_item.Active = Preferences.Get<bool> (key);
 				break;
 
 			case Preferences.VIEWER_TRANSPARENCY:
-				if (val as string == "CHECK_PATTERN")
+				if (Preferences.Get<string> (key) == "CHECK_PATTERN")
 					image_view.SetCheckSize (2);
-				else if (val as string == "COLOR")
-					image_view.SetTransparentColor (Preferences.Get(Preferences.VIEWER_TRANS_COLOR) as string);
+				else if (Preferences.Get<string> (key) == "COLOR")
+					image_view.SetTransparentColor (Preferences.Get<string> (Preferences.VIEWER_TRANS_COLOR));
 				else // NONE
 					image_view.SetTransparentColor (image_view.Style.BaseColors [(int)Gtk.StateType.Normal]);
 				break;
 
 			case Preferences.VIEWER_TRANS_COLOR:
-				if (Preferences.Get(Preferences.VIEWER_TRANSPARENCY) as string == "COLOR")
-					image_view.SetTransparentColor (val as string);
+				if (Preferences.Get<string> (Preferences.VIEWER_TRANSPARENCY) == "COLOR")
+					image_view.SetTransparentColor (Preferences.Get<string> (key));
 				break;
 			}
 		}
@@ -666,17 +661,13 @@
 
 			void LoadPreference (string key)
 			{
-				object val = Preferences.Get (key);
-
-				if (val == null)
-					return;
-			
+		
 				switch (key) {
 				case Preferences.VIEWER_INTERPOLATION:
-					interpolation_check.Active = (bool) val;
+					interpolation_check.Active = Preferences.Get<bool> (key);
 					break;
 				case Preferences.VIEWER_TRANSPARENCY:
-					switch ((string) val) {
+					switch (Preferences.Get<string> (key)) {
 					case "COLOR":
 						as_color_radio.Active = true;
 						break;
@@ -690,9 +681,9 @@
 					break;
 				case Preferences.VIEWER_TRANS_COLOR:
 					color_button.Color = new Gdk.Color (
-						Byte.Parse ((val as string).Substring (1,2), System.Globalization.NumberStyles.AllowHexSpecifier),
-						Byte.Parse ((val as string).Substring (3,2), System.Globalization.NumberStyles.AllowHexSpecifier),
-						Byte.Parse ((val as string).Substring (5,2), System.Globalization.NumberStyles.AllowHexSpecifier));
+						Byte.Parse (Preferences.Get<string> (key).Substring (1,2), System.Globalization.NumberStyles.AllowHexSpecifier),
+						Byte.Parse (Preferences.Get<string> (key).Substring (3,2), System.Globalization.NumberStyles.AllowHexSpecifier),
+						Byte.Parse (Preferences.Get<string> (key).Substring (5,2), System.Globalization.NumberStyles.AllowHexSpecifier));
 					break;
 				}
 			}

Modified: trunk/src/UI.Dialog/LastRollDialog.cs
==============================================================================
--- trunk/src/UI.Dialog/LastRollDialog.cs	(original)
+++ trunk/src/UI.Dialog/LastRollDialog.cs	Fri May 30 10:33:08 2008
@@ -34,7 +34,7 @@
 			this.query = query;
 			this.rollstore = rollstore;
 			this.parent_window = parent_window;
-			rolls = rollstore.GetRolls ((int) FSpot.Preferences.Get (FSpot.Preferences.IMPORT_GUI_ROLL_HISTORY));
+			rolls = rollstore.GetRolls (FSpot.Preferences.Get<int> (FSpot.Preferences.IMPORT_GUI_ROLL_HISTORY));
 
 			PopulateCombos ();
 			

Modified: trunk/src/UI.Dialog/PreferenceDialog.cs
==============================================================================
--- trunk/src/UI.Dialog/PreferenceDialog.cs	(original)
+++ trunk/src/UI.Dialog/PreferenceDialog.cs	Fri May 30 10:33:08 2008
@@ -68,7 +68,7 @@
 			LoadPreference (Preferences.METADATA_EMBED_IN_IMAGE);
 			LoadPreference (Preferences.SCREENSAVER_TAG);
 			LoadPreference (Preferences.GNOME_SCREENSAVER_THEME);
-			if (Global.PhotoDirectory == (string)Preferences.Get(Preferences.STORAGE_PATH)) {
+			if (Global.PhotoDirectory == Preferences.Get<string> (Preferences.STORAGE_PATH)) {
 				photosdir_chooser.CurrentFolderChanged += HandlePhotosdirChanged;
 				photosdir_chooser.SetCurrentFolder (Global.PhotoDirectory);
 			} else {
@@ -120,7 +120,7 @@
 						if (File.Exists (Path.Combine (dir, gtkrc)) && !theme_list.ContainsKey (Path.GetFileName (dir)))
 							theme_list.Add (Path.GetFileName (dir), Path.Combine (dir, gtkrc));
 			
-			string active_theme = Preferences.Get (Preferences.GTK_RC) as string;
+			string active_theme = Preferences.Get<string> (Preferences.GTK_RC);
 			int it = 0;
 			foreach (string theme in theme_list.Keys) {
 				themelist_combo.AppendText (Path.GetFileName (theme));
@@ -134,7 +134,7 @@
 			themelist_combo.Show ();
 			themelist_combo.Sensitive = theme_filechooser.Sensitive = themecustom_radio.Active; 
 			if (File.Exists (active_theme))
-				theme_filechooser.SetFilename (Preferences.Get (Preferences.GTK_RC) as string);
+				theme_filechooser.SetFilename (Preferences.Get<string> (Preferences.GTK_RC));
 			theme_filechooser.SelectionChanged += HandleThemeFileActivated;
 			themecustom_radio.Active = (active_theme != String.Empty);	
 
@@ -211,7 +211,7 @@
 			else
 				File.SetLastWriteTime (Path.Combine (Global.BaseDirectory, "gtkrc"), DateTime.Now);
 			Gtk.Rc.DefaultFiles = Global.DefaultRcFiles;
-			Gtk.Rc.AddDefaultFile (Preferences.Get (Preferences.GTK_RC) as string);
+			Gtk.Rc.AddDefaultFile (Preferences.Get<string> (Preferences.GTK_RC));
 			foreach (string s in Rc.DefaultFiles)
 			Console.WriteLine (s);
 			Gtk.Rc.ReparseAll ();
@@ -220,7 +220,7 @@
 
 		void HandleThemeFileActivated (object o, EventArgs e)
 		{
-			if (theme_filechooser.Filename != null && theme_filechooser.Filename != Preferences.Get (Preferences.GTK_RC)) {
+			if (theme_filechooser.Filename != null && theme_filechooser.Filename != Preferences.Get<string> (Preferences.GTK_RC)) {
 				Preferences.Set (Preferences.GTK_RC, theme_filechooser.Filename);	
 #if GTK_2_12_2
 				if (!File.Exists (Path.Combine (Global.BaseDirectory, "gtkrc")))
@@ -228,7 +228,7 @@
 				else
 					File.SetLastWriteTime (Path.Combine (Global.BaseDirectory, "gtkrc"), DateTime.Now);
 				Gtk.Rc.DefaultFiles = Global.DefaultRcFiles;
-				Gtk.Rc.AddDefaultFile (Preferences.Get (Preferences.GTK_RC) as string);
+				Gtk.Rc.AddDefaultFile (Preferences.Get<string> (Preferences.GTK_RC));
 				foreach (string s in Rc.DefaultFiles)
 				Console.WriteLine (s);
 				Gtk.Rc.ReparseAll ();
@@ -262,17 +262,15 @@
 
 		void LoadPreference (string key)
 		{
-			object val = Preferences.Get (key);
-
 			switch (key) {
 			case Preferences.METADATA_EMBED_IN_IMAGE:
-				bool active = (bool) val;
+				bool active = Preferences.Get<bool> (key);
 				if (metadata_check.Active != active)
 					metadata_check.Active = active;
 				break;
 			case Preferences.SCREENSAVER_TAG:
 				try {
-					screensaver_tag = (int) val;
+					screensaver_tag = Preferences.Get<int> (key);
 				} catch (System.Exception e) {
 					Console.WriteLine (e);
 					screensaver_tag = 0;
@@ -286,8 +284,8 @@
 				break;
 			case Preferences.GNOME_SCREENSAVER_THEME:
 			case Preferences.GNOME_SCREENSAVER_MODE:
-				string [] theme = (string []) Preferences.Get (Preferences.GNOME_SCREENSAVER_THEME);
-				string mode = (string) Preferences.Get (Preferences.GNOME_SCREENSAVER_MODE);
+				string [] theme = Preferences.Get<string []> (Preferences.GNOME_SCREENSAVER_THEME);
+				string mode = Preferences.Get<string> (Preferences.GNOME_SCREENSAVER_MODE);
 				
 				bool sensitive = mode != SaverMode;
 				sensitive |= (theme == null || theme.Length != 1 || theme [0] != SaverCommand);
@@ -295,16 +293,16 @@
 				set_saver_button.Sensitive = sensitive;
 				break;
 			case Preferences.STORAGE_PATH:
-				photosdir_chooser.SetCurrentFolder ((string)val);
+				photosdir_chooser.SetCurrentFolder (Preferences.Get<string> (key));
 				break;
 			case Preferences.DBUS_READ_ONLY:
-				dbus_check.Active = !((bool)val);
+				dbus_check.Active = !(Preferences.Get<bool> (key));
 				break;
 			case Preferences.GTK_RC:
-				themenone_radio.Active = (val as string == String.Empty);
-				themecustom_radio.Active = (val as string != String.Empty);
+				themenone_radio.Active = (Preferences.Get<string> (key) == String.Empty);
+				themecustom_radio.Active = (Preferences.Get<string> (key) != String.Empty);
 				if (theme_filechooser.Sensitive)
-					theme_filechooser.SetFilename (val as string);
+					theme_filechooser.SetFilename (Preferences.Get<string> (key));
 				break;
 			}
 		}

Modified: trunk/src/UI.Dialog/SelectionRatioDialog.cs
==============================================================================
--- trunk/src/UI.Dialog/SelectionRatioDialog.cs	(original)
+++ trunk/src/UI.Dialog/SelectionRatioDialog.cs	Fri May 30 10:33:08 2008
@@ -72,7 +72,7 @@
 			constraints_store = new ListStore (typeof (string), typeof (double));
 			content_treeview.Model = constraints_store;
 			XmlSerializer serializer = new XmlSerializer (typeof(SelectionConstraint));
-			string [] vals = Preferences.Get (Preferences.CUSTOM_CROP_RATIOS) as string[];
+			string [] vals = Preferences.Get<string []> (Preferences.CUSTOM_CROP_RATIOS);
 			if (vals != null) 
 				foreach (string xml in vals) {
 					SelectionConstraint constraint = (SelectionConstraint)serializer.Deserialize (new StringReader (xml));
@@ -87,8 +87,6 @@
 	
 		private void LoadPreference (String key)
 		{
-			object val = Preferences.Get (key);
-	
 			switch (key) {
 			case Preferences.CUSTOM_CROP_RATIOS:
 				Populate ();

Modified: trunk/src/main.cs
==============================================================================
--- trunk/src/main.cs	(original)
+++ trunk/src/main.cs	Fri May 30 10:33:08 2008
@@ -76,7 +76,7 @@
 				       Defines.VERSION, 
 				       Modules.UI, args);		
 		
-		FSpot.Global.PhotoDirectory = (string) Preferences.Get(Preferences.STORAGE_PATH);
+		FSpot.Global.PhotoDirectory = Preferences.Get<string> (Preferences.STORAGE_PATH);
 
 		for (int i = 0; i < args.Length && !shutdown; i++) {
 			switch (args [i]) {
@@ -211,14 +211,14 @@
 						create = false;
 						Gnome.Vfs.Vfs.Initialize ();
 
-						if (File.Exists (Preferences.Get (Preferences.GTK_RC) as string)) {
+						if (File.Exists (Preferences.Get<string> (Preferences.GTK_RC))) {
 #if GTK_2_12_2
 							if (!File.Exists (Path.Combine (Global.BaseDirectory, "gtkrc")))
 								(File.Create (Path.Combine (Global.BaseDirectory, "gtkrc"))).Dispose ();
 							Gtk.Rc.AddDefaultFile (Path.Combine (Global.BaseDirectory, "gtkrc"));
 							Global.DefaultRcFiles = Gtk.Rc.DefaultFiles;
 #endif
-							Gtk.Rc.AddDefaultFile (Preferences.Get (Preferences.GTK_RC) as string);
+							Gtk.Rc.AddDefaultFile (Preferences.Get<string> (Preferences.GTK_RC));
 						}
 						
 						Catalog.Init ("f-spot", Defines.LOCALE_DIR);



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