Call g_main_thread_init() after setting g_threads_got_initialized.

Fri Dec 20 09:37:27 2002  Owen Taylor  <otaylor@redhat.com>

        * gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
        after setting g_threads_got_initialized. (#101624,
        Alceste Scalas, Sebastian Wilhelmi)

8 files changed, 47 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b2e2aef41..1dc1854d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 20 09:37:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
+	after setting g_threads_got_initialized. (#101624, 
+	Alceste Scalas, Sebastian Wilhelmi)
+
 Wed Dec 18 16:19:08 2002  Manish Singh  <yosh@gimp.org>
 
 	* glib/gtypes.h: new endian asm for ia64 and x86_64, general
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b2e2aef41..1dc1854d6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Dec 20 09:37:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
+	after setting g_threads_got_initialized. (#101624, 
+	Alceste Scalas, Sebastian Wilhelmi)
+
 Wed Dec 18 16:19:08 2002  Manish Singh  <yosh@gimp.org>
 
 	* glib/gtypes.h: new endian asm for ia64 and x86_64, general
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index b2e2aef41..1dc1854d6 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Fri Dec 20 09:37:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
+	after setting g_threads_got_initialized. (#101624, 
+	Alceste Scalas, Sebastian Wilhelmi)
+
 Wed Dec 18 16:19:08 2002  Manish Singh  <yosh@gimp.org>
 
 	* glib/gtypes.h: new endian asm for ia64 and x86_64, general
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b2e2aef41..1dc1854d6 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Dec 20 09:37:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
+	after setting g_threads_got_initialized. (#101624, 
+	Alceste Scalas, Sebastian Wilhelmi)
+
 Wed Dec 18 16:19:08 2002  Manish Singh  <yosh@gimp.org>
 
 	* glib/gtypes.h: new endian asm for ia64 and x86_64, general
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b2e2aef41..1dc1854d6 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Dec 20 09:37:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
+	after setting g_threads_got_initialized. (#101624, 
+	Alceste Scalas, Sebastian Wilhelmi)
+
 Wed Dec 18 16:19:08 2002  Manish Singh  <yosh@gimp.org>
 
 	* glib/gtypes.h: new endian asm for ia64 and x86_64, general
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b2e2aef41..1dc1854d6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Dec 20 09:37:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
+	after setting g_threads_got_initialized. (#101624, 
+	Alceste Scalas, Sebastian Wilhelmi)
+
 Wed Dec 18 16:19:08 2002  Manish Singh  <yosh@gimp.org>
 
 	* glib/gtypes.h: new endian asm for ia64 and x86_64, general
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b2e2aef41..1dc1854d6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Dec 20 09:37:27 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
+	after setting g_threads_got_initialized. (#101624, 
+	Alceste Scalas, Sebastian Wilhelmi)
+
 Wed Dec 18 16:19:08 2002  Manish Singh  <yosh@gimp.org>
 
 	* glib/gtypes.h: new endian asm for ia64 and x86_64, general
diff --git a/gthread/gthread-impl.c b/gthread/gthread-impl.c
index bed7050cf..3825e40d4 100644
--- a/gthread/gthread-impl.c
+++ b/gthread/gthread-impl.c
@@ -384,12 +384,16 @@ g_thread_init (GThreadFunctions* init)
   g_messages_init ();
   g_convert_init ();
   g_rand_init ();
-  g_main_thread_init ();
 
   /* now we can set g_threads_got_initialized and thus enable
    * all the thread functions
    */
   g_threads_got_initialized = TRUE;
+
+  /* This has to come after g_threads_got_initialized is set
+   * since it uses a private variable created by g_mem_init()
+   */
+  g_main_thread_init ();
 }
 
 #else /* !G_THREADS_ENABLED */