[monkey-bubble: 511/753] Don't call g_thread_init () if it has already been called by another

[Sven Herzberg <herzi src gnome org>]

commit b4d41e241ac107d8c1bd8bd107c360f4a9b8c22a
Author: Seth Nickell <snickell stanford edu>
Date:   Mon Jul 9 05:37:08 2001 +0000

    Don't call g_thread_init () if it has already been called by another
    
    2001-07-08  Seth Nickell  <snickell stanford edu>
    
    	* libgnome/libgnome-init.c: (gnome_oaf_pre_args_parse):
    
    	Don't call g_thread_init () if it has already been called
    	by another library / application / what have you. g_thread_init
    	can only be called *once*.
    
    	* po/ChangeLog:
    
    	Curse you gettext.

 ChangeLog             |   12 ++++++++++++
 libgnome/gnome-init.c |    2 +-
 po/ChangeLog          |   22 ++++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 650f0a9..b2725ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-07-08  Seth Nickell  <snickell stanford edu>
+
+	* libgnome/libgnome-init.c: (gnome_oaf_pre_args_parse):
+
+	Don't call g_thread_init () if it has already been called
+	by another library / application / what have you. g_thread_init
+	can only be called *once*.
+	
+	* po/ChangeLog:
+
+	Curse you gettext.
+
 Thu Jun 28 22:58:23 2001  Owen Taylor  <otaylor redhat com>
 
 	* libgnome/gnome-program.c: g_type_init() no longer
diff --git a/libgnome/gnome-init.c b/libgnome/gnome-init.c
index a34c932..ecfd71d 100644
--- a/libgnome/gnome-init.c
+++ b/libgnome/gnome-init.c
@@ -60,7 +60,7 @@
 static void
 gnome_oaf_pre_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
 {
-	g_thread_init (NULL);
+        if (!g_thread_supported()) g_thread_init (NULL);
 
 	oaf_preinit (program, mod_info);
 }
diff --git a/po/ChangeLog b/po/ChangeLog
index 80c685b..4d202d0 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,11 +1,33 @@
+2001-07-08  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+<<<<<<< ChangeLog
+<<<<<<< ChangeLog
+2001-06-22  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-22  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-22  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+=======
+=======
 2001-07-07  Christopher R. Gabriel  <cgabriel cgabriel org>
 
 	* it.po: Added italian translation.
 
+>>>>>>> 1.11
 2001-06-26  Fatih Demir <kabalak gtranslator org>
 
 	* ta.po: Added Tamil translation by Dinesh.
 
+>>>>>>> 1.10
 2001-06-19  Héctor García Álvarez  <hector scouts-es org>
 
         * es.po: Updated Spanish translation.