f-spot r3917 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Wed May 14 20:43:19 2008
New Revision: 3917
URL: http://svn.gnome.org/viewvc/f-spot?rev=3917&view=rev

Log:
conditionally compile the gconf workaround

Modified:
   trunk/configure.in
   trunk/src/GConfPreferenceBackend.cs

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed May 14 20:43:19 2008
@@ -137,6 +137,9 @@
   if pkg-config --atleast-version=2.18 gconf-sharp-2.0; then
     CSC_DEFINES="$CSC_DEFINES -d:GCONF_SHARP_2_18"
   fi
+  if pkg-config --atleast-version=2.20.2 gconf-sharp-2.0; then
+    CSC_DEFINES="$CSC_DEFINES -d:GCONF_SHARP_2_20_2"
+  fi
 fi
 
 AC_SUBST(CSC_DEFINES)

Modified: trunk/src/GConfPreferenceBackend.cs
==============================================================================
--- trunk/src/GConfPreferenceBackend.cs	(original)
+++ trunk/src/GConfPreferenceBackend.cs	Wed May 14 20:43:19 2008
@@ -13,15 +13,19 @@
 {
 	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) {
-					//workaround for bgo #481741, but should be fixed upstream
+#if !GCONF_SHARP_2_20_2
+					//workaround for bgo #481741, fixed upstream
 					g_type_init ();
+#endif
 					client = new GConf.Client ();
 				}
 				return client;