rpms/gnome-sharp/devel gnome-sharp-gconf-init.patch, NONE, 1.1 gnome-sharp.spec, 1.17, 1.18

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28356

Modified Files:
	gnome-sharp.spec 
Added Files:
	gnome-sharp-gconf-init.patch 
Log Message:
make tomboy work before gconfd


gnome-sharp-gconf-init.patch:

--- NEW FILE gnome-sharp-gconf-init.patch ---
diff -up gnome-sharp-2.24.0/gconf/GConf/ClientBase.cs.gconf-init gnome-sharp-2.24.0/gconf/GConf/ClientBase.cs
--- gnome-sharp-2.24.0/gconf/GConf/ClientBase.cs.gconf-init	2008-08-06 18:00:49.000000000 -0400
+++ gnome-sharp-2.24.0/gconf/GConf/ClientBase.cs	2009-04-04 21:26:40.419750583 -0400
@@ -40,13 +40,13 @@ namespace GConf
 
 		internal void Initialize ()
 		{
+			GLib.GType.Init ();
 			if (!gconf_is_initialized ())
 			{
 				IntPtr err;
 				gconf_init (0, IntPtr.Zero, out err);
 				if (err != IntPtr.Zero)
 					throw new GLib.GException (err);
-				GLib.GType.Init ();
 			}
 		}
 	}


Index: gnome-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-sharp/devel/gnome-sharp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-sharp.spec	24 Feb 2009 23:26:40 -0000	1.17
+++ gnome-sharp.spec	5 Apr 2009 01:41:53 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           gnome-sharp
 Version:        2.24.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -16,6 +16,8 @@
 # Disabled, gtkhtml has been removed
 #Patch3: %{name}-2.16.0-gtkhtml3-3.14.patch
 #Patch4: %{name}-2.16.1-assemblydir.patch
+# init gtype before using gconf
+Patch2: gnome-sharp-gconf-init.patch
 
 BuildRequires:  mono-devel gtk2-devel libart_lgpl-devel gnome-vfs2-devel libgnomecanvas-devel libgnomeui-devel
 BuildRequires:  gtk-sharp2-devel >= 2.10.0
@@ -51,7 +53,7 @@
 #%patch2 -p1 -b .automake-1.10
 #%patch3 -p1 -b .gtkhtml3-3.14
 #%patch4 -p1 -b .assemblydir
-
+%patch2 -p1 -b .gconf-init
 
 %build
 autoreconf --force --install
@@ -90,6 +92,9 @@
 %{_libdir}/pkgconfig/gconf-sharp-peditors-2.0.pc
 
 %changelog
+* Sat Apr  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.0-3
+- Make tomboy work before gconfd is started (#494065)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild