Clarification for g_mutex_trylock.

2001-05-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* glib/tmpl/threads.sgml: Clarification for g_mutex_trylock.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 283e7d7f598ea938cbc470657067984dec9b06ef..796575f6ba950bdd2e6d5ba0193c5173c2d7a24c 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -2,6 +2,8 @@
 
        * glib/tmpl/threads.sgml, glib/glib-overrides.txt: Updated.
 
+       * glib/tmpl/threads.sgml: Clarification for g_mutex_trylock.
+
 2001-04-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib/tmpl/hash_tables.sgml, glib/tmpl/misc_utils.sgml,

diff --git a/docs/reference/glib/tmpl/threads.sgml b/docs/reference/glib/tmpl/threads.sgml
index 3fbb1c33d1ef96a1b443e2ec245b6b314820a17e..03b3b34d5a74f65962e5a8a2748873d9769151aa 100644 (file)
--- a/docs/reference/glib/tmpl/threads.sgml
+++ b/docs/reference/glib/tmpl/threads.sgml
@@ -550,7 +550,7 @@ called and will do nothing then.
 <note>
 <para>
 #GMutex is not recursive, i.e. a thread will deadlock, if it already
-has locked the #GMutex while calling g_mutex_lock(). Use
+has locked @mutex while calling g_mutex_lock(). Use
 #GStaticRecMutex instead, if you need recursive mutexes.
 </para>
 </note>
@@ -571,6 +571,14 @@ This function can also be used, if g_thread_init() has not yet been
 called and will immediately return TRUE then.
 </para>
 
+<note>
+<para>
+#GMutex is not recursive, i.e. g_mutex_trylock() will return FALSE,
+if the current thread already has locked @mutex. Use
+#GStaticRecMutex instead, if you need recursive mutexes.
+</para>
+</note>
+
 @mutex: a #GMutex
 @Returns: TRUE, if @mutex could be locked