OK to commit?
--
Maciej Stachowiak <[EMAIL PROTECTED]>
whacky-ass code cowboy[sic]
Technical Lead, Services Engineering
Eazel, Inc.
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-python/ChangeLog,v
retrieving revision 1.67.2.5
diff -u -p -r1.67.2.5 ChangeLog
--- ChangeLog 2001/02/16 05:45:15 1.67.2.5
+++ ChangeLog 2001/03/21 05:23:30
@@ -1,3 +1,10 @@
+2001-03-20 Maciej Stachowiak <[EMAIL PROTECTED]>
+
+ * pygtk/gtkmodule.c Don't call g_thread_init if gthread has
+ already been initialized, for the benefit of programs that use
+ gthread themselves and want to be able to embed Python code that
+ uses the gtk module.
+
2001-02-16 James Henstridge <[EMAIL PROTECTED]>
* NEWS: update news items.
Index: pygtk/gtkmodule.c
===================================================================
RCS file: /cvs/gnome/gnome-python/pygtk/gtkmodule.c,v
retrieving revision 1.53.2.5
diff -u -p -r1.53.2.5 gtkmodule.c
--- pygtk/gtkmodule.c 2001/03/13 05:41:00 1.53.2.5
+++ pygtk/gtkmodule.c 2001/03/21 05:23:31
@@ -7024,7 +7024,8 @@ void init_gtk() {
#ifdef WITH_THREAD
/* it is required that this function be called to enable the thread
* safety functions */
- g_thread_init(NULL);
+ if (!g_threads_got_initialized)
+ g_thread_init(NULL);
#endif
if (PyErr_Occurred())
_______________________________________________
pygtk mailing list [EMAIL PROTECTED]
http://www.daa.com.au/mailman/listinfo/pygtk
