f-spot r3933 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Mon May 19 11:29:07 2008
New Revision: 3933
URL: http://svn.gnome.org/viewvc/f-spot?rev=3933&view=rev

Log:
2008-05-19  Stephane Delcroix  <sdelcroix novell com>

	* src/main.cs:
	* src/GConfPreferenceBackend.cs: call Gnome.Program ctor prior to 
	GConf.Client. Remove the need for g_type_init call.


Modified:
   trunk/ChangeLog
   trunk/src/GConfPreferenceBackend.cs
   trunk/src/main.cs

Modified: trunk/src/GConfPreferenceBackend.cs
==============================================================================
--- trunk/src/GConfPreferenceBackend.cs	(original)
+++ trunk/src/GConfPreferenceBackend.cs	Mon May 19 11:29:07 2008
@@ -13,21 +13,11 @@
 {
 	public class GConfPreferenceBackend : IPreferenceBackend
 	{
-#if !GCONF_SHARP_2_20_2
-		[DllImport("libgobject-2.0-0.dll")]
-		static extern void g_type_init ();
-#endif
-
 		private static GConf.Client client;
 		private GConf.Client Client {
 			get {
-				if (client == null) {
-#if !GCONF_SHARP_2_20_2
-					//workaround for bgo #481741, fixed upstream
-					g_type_init ();
-#endif
+				if (client == null)
 					client = new GConf.Client ();
-				}
 				return client;	
 			}
 		}

Modified: trunk/src/main.cs
==============================================================================
--- trunk/src/main.cs	(original)
+++ trunk/src/main.cs	Mon May 19 11:29:07 2008
@@ -73,6 +73,10 @@
 		//LogFunc logFunc = new GLib.LogFunc (GLib.Log.PrintTraceLogFunction);
 		//Log.SetLogHandler ("GdkPixbuf", GLib.LogLevelFlags.Critical, logFunc);
 
+		program = new Program (Defines.PACKAGE, 
+				       Defines.VERSION, 
+				       Modules.UI, args);		
+		
 		FSpot.Global.PhotoDirectory = (string) Preferences.Get(Preferences.STORAGE_PATH);
 
 		for (int i = 0; i < args.Length && !shutdown; i++) {
@@ -158,9 +162,6 @@
 		if (slideshow == true) {
 			Catalog.Init ("f-spot", Defines.LOCALE_DIR);
 				
-			program = new Program (Defines.PACKAGE, 
-					       Defines.VERSION, 
-					       Modules.UI, args);
 			Core core = new Core ();
 			core.ShowSlides (null);
 			program.Run ();
@@ -175,14 +176,6 @@
 			} catch (Exception e) {
 				throw new ApplicationException ("F-Spot cannot find the Dbus session bus.  Make sure dbus is configured properly or start a new session for f-spot using \"dbus-launch f-spot\"", e);
 			}
-			/* 
-			 * FIXME we need to inialize gobject before making the dbus calls, we'll go 
-			 * ahead and do it like this for now.
-			 */ 
-			program = new Program (Defines.PACKAGE, 
-					       Defines.VERSION, 
-					       Modules.UI, args);		
-			
 			Console.WriteLine ("Initializing Mono.Addins");
 			AddinManager.Initialize (FSpot.Global.BaseDirectory);
 			AddinManager.Registry.Update (null);
@@ -301,7 +294,6 @@
 			System.Console.WriteLine ("exiting");
 		} catch (System.Exception e) {
 			Console.Error.WriteLine(e);
-			Gtk.Application.Init();
 			ExceptionDialog dlg = new ExceptionDialog(e);
 			dlg.Run();
 			dlg.Destroy();