File catalog_init.patch of Package f-spot
From 24c3a9e8ed36bb2a71f4cef3216fbca3cb5fcc38 Mon Sep 17 00:00:00 2001
From: sdelcroix <sdelcroix@772769d8-d925-0410-89eb-a6ffa0d40526>
Date: Mon, 3 Nov 2008 21:50:17 +0000
Subject: [PATCH] 2008-11-03 Stephane Delcroix <sdelcroix@novell.com>
* src/main.cs: backporting the catalog initialization fix from trunk
git-svn-id: svn+ssh://svn.gnome.org/svn/f-spot/branches/FSPOT_0_5_0_STABLE@4564 772769d8-d925-0410-89eb-a6ffa0d40526
---
ChangeLog | 4 ++++
src/main.cs | 8 +++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4b1731a..e1974ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-03 Stephane Delcroix <sdelcroix@novell.com>
+
+ * src/main.cs: backporting the catalog initialization fix from trunk
+
2008-10-24 Stephane Delcroix <sdelcroix@novell.com>
* src/Preferences.cs: change the sidebar_size default.
diff --git a/src/main.cs b/src/main.cs
index f96bf21..b77af6a 100644
--- a/src/main.cs
+++ b/src/main.cs
@@ -71,8 +71,9 @@ public class Driver {
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 @@ public class Driver {
}
if (slideshow == true) {
- Catalog.Init ("f-spot", Defines.LOCALE_DIR);
-
Core core = new Core ();
core.ShowSlides (null);
program.Run ();
@@ -231,7 +230,6 @@ public class Driver {
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),
--
1.6.0.2
