Patch for libgnome to work with ORBit2



Hi Martin,
	Libgnome needs the following patch to work with ORBit2. Otherwise linc
calls g_thread_init () a second time which results in a g_error().

--
Peter Williams     peter newton cx / peterw ximian com

"Why should I have to change my name? He's the one who 
sucks!"                              -- Michael Bolton
? tmp.diff
? libgnome/mo
? libgnome/libgnometypebuiltins_inits.c
? libgnome/libgnometypes.h
Index: libgnome/ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/ChangeLog,v
retrieving revision 1.289
diff -u -r1.289 ChangeLog
--- libgnome/ChangeLog	2001/07/04 12:36:42	1.289
+++ libgnome/ChangeLog	2001/07/08 22:36:57
@@ -1,3 +1,8 @@
+2001-07-08  Peter Williams  <peterw ximian com>
+
+	* libgnome-init.c (gnome_oaf_pre_args_parse): Don't call g_thread_init
+	if we're using ORBit2.
+
 2001-07-04  Michael Meeks  <michael ximian com>
 
 	* Makefile.am: remove gnome-fileconvert.[ch]
Index: libgnome/libgnome-init.c
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/libgnome-init.c,v
retrieving revision 1.68
diff -u -r1.68 libgnome-init.c
--- libgnome/libgnome-init.c	2001/07/03 17:55:42	1.68
+++ libgnome/libgnome-init.c	2001/07/08 22:36:57
@@ -60,8 +60,9 @@
 static void
 gnome_oaf_pre_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
 {
+#ifndef ORBIT2
 	g_thread_init (NULL);
-
+#endif
 	oaf_preinit (program, mod_info);
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]