fix to the locking so we don't hang

2001-10-31  Havoc Pennington  <hp@redhat.com>

	* glib/gmain.c (g_main_loop_run): fix to the locking so we don't
	hang

diff --git a/ChangeLog b/ChangeLog
index b6a6db3db083935a8b2ace77a39fd4fc476a5ee2..3eac356f47e88ae4a6ac9e038b73347615a11965 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-31  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmain.c (g_main_loop_run): fix to the locking so we don't
+       hang
+
 2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Make --with-threads=none mean, that we want thread

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b6a6db3db083935a8b2ace77a39fd4fc476a5ee2..3eac356f47e88ae4a6ac9e038b73347615a11965 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-10-31  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmain.c (g_main_loop_run): fix to the locking so we don't
+       hang
+
 2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Make --with-threads=none mean, that we want thread

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b6a6db3db083935a8b2ace77a39fd4fc476a5ee2..3eac356f47e88ae4a6ac9e038b73347615a11965 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-10-31  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmain.c (g_main_loop_run): fix to the locking so we don't
+       hang
+
 2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Make --with-threads=none mean, that we want thread

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index b6a6db3db083935a8b2ace77a39fd4fc476a5ee2..3eac356f47e88ae4a6ac9e038b73347615a11965 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2001-10-31  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmain.c (g_main_loop_run): fix to the locking so we don't
+       hang
+
 2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Make --with-threads=none mean, that we want thread

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b6a6db3db083935a8b2ace77a39fd4fc476a5ee2..3eac356f47e88ae4a6ac9e038b73347615a11965 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-10-31  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmain.c (g_main_loop_run): fix to the locking so we don't
+       hang
+
 2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Make --with-threads=none mean, that we want thread

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b6a6db3db083935a8b2ace77a39fd4fc476a5ee2..3eac356f47e88ae4a6ac9e038b73347615a11965 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-10-31  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmain.c (g_main_loop_run): fix to the locking so we don't
+       hang
+
 2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Make --with-threads=none mean, that we want thread

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b6a6db3db083935a8b2ace77a39fd4fc476a5ee2..3eac356f47e88ae4a6ac9e038b73347615a11965 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-10-31  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmain.c (g_main_loop_run): fix to the locking so we don't
+       hang
+
 2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Make --with-threads=none mean, that we want thread

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b6a6db3db083935a8b2ace77a39fd4fc476a5ee2..3eac356f47e88ae4a6ac9e038b73347615a11965 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-10-31  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmain.c (g_main_loop_run): fix to the locking so we don't
+       hang
+
 2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Make --with-threads=none mean, that we want thread

diff --git a/docs/reference/glib/tmpl/unicode.sgml b/docs/reference/glib/tmpl/unicode.sgml
index 3c6287e3cff4665651afe7d029898cd3a89c7c99..6d64176ee11154c80278b85621d6a4d5508b5ce0 100644 (file)
--- a/docs/reference/glib/tmpl/unicode.sgml
+++ b/docs/reference/glib/tmpl/unicode.sgml
@@ -31,8 +31,9 @@ A type which can hold any UTF-16 character code.
 
 </para>
 
-@charset: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@charset: 
 
 
 <!-- ##### FUNCTION g_unichar_validate ##### -->

diff --git a/glib/gmain.c b/glib/gmain.c
index 1103ffaa0e1fdf5fa839ed00b7f0676f1c546233..3d1fa0b22525977ef2f62cb9e8bc08ae0a859928 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -2449,11 +2449,13 @@ g_main_loop_run (GMainLoop *loop)
   while (loop->is_running)
     g_main_context_iterate (loop->context, TRUE, TRUE, self);
 
+  UNLOCK_CONTEXT (loop->context);
+  
 #ifdef G_THREADS_ENABLED
   g_main_context_release (loop->context);
 #endif /* G_THREADS_ENABLED */    
   
-  g_main_loop_unref_and_unlock (loop);
+  g_main_loop_unref (loop);
 }
 
 /**