f-spot r4564 - in branches/FSPOT_0_5_0_STABLE: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Mon Nov  3 21:50:17 2008
New Revision: 4564
URL: http://svn.gnome.org/viewvc/f-spot?rev=4564&view=rev

Log:
2008-11-03  Stephane Delcroix  <sdelcroix novell com>

	* src/main.cs: backporting the catalog initialization fix from trunk

Modified:
   branches/FSPOT_0_5_0_STABLE/ChangeLog
   branches/FSPOT_0_5_0_STABLE/src/main.cs

Modified: branches/FSPOT_0_5_0_STABLE/src/main.cs
==============================================================================
--- branches/FSPOT_0_5_0_STABLE/src/main.cs	(original)
+++ branches/FSPOT_0_5_0_STABLE/src/main.cs	Mon Nov  3 21:50:17 2008
@@ -71,8 +71,9 @@
 		
 		program = new Program (Defines.PACKAGE, 
 				       Defines.VERSION, 
-				       Modules.UI, args);		
-		
+				       Modules.UI, args);
+
+		Catalog.Init ("f-spot", Defines.LOCALE_DIR);
 		FSpot.Global.PhotoDirectory = Preferences.Get<string> (Preferences.STORAGE_PATH);
 
 		for (int i = 0; i < args.Length && !shutdown; i++) {
@@ -170,8 +171,6 @@
 		}
 
 		if (slideshow == true) {
-			Catalog.Init ("f-spot", Defines.LOCALE_DIR);
-				
 			Core core = new Core ();
 			core.ShowSlides (null);
 			program.Run ();
@@ -231,7 +230,6 @@
 							Gtk.Rc.AddDefaultFile (Preferences.Get<string> (Preferences.GTK_RC));
 						}
 						
-						Catalog.Init ("f-spot", Defines.LOCALE_DIR);
 						try {
 							Gtk.Window.DefaultIconList = new Gdk.Pixbuf [] {
 								GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, "f-spot", 16, (Gtk.IconLookupFlags)0),