From e1c15eb0d13eecfeea5059cf1f93e18040be4653 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 1 Mar 2004 02:45:15 +0000 Subject: [PATCH] Fix leftover references to g_main_context_depth() in docs. Sun Feb 29 21:42:47 2004 Owen Taylor * glib/gmain.c: Fix leftover references to g_main_context_depth() in docs. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gmain.c | 10 +++++----- 7 files changed, 35 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8b81262c..fa93b826a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Feb 29 21:42:47 2004 Owen Taylor + + * glib/gmain.c: Fix leftover references to + g_main_context_depth() in docs. + Sun Feb 29 21:34:34 2004 Owen Taylor * glib/gmain.[ch]: Add g_main_depth() (Request from diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d8b81262c..fa93b826a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Feb 29 21:42:47 2004 Owen Taylor + + * glib/gmain.c: Fix leftover references to + g_main_context_depth() in docs. + Sun Feb 29 21:34:34 2004 Owen Taylor * glib/gmain.[ch]: Add g_main_depth() (Request from diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index d8b81262c..fa93b826a 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sun Feb 29 21:42:47 2004 Owen Taylor + + * glib/gmain.c: Fix leftover references to + g_main_context_depth() in docs. + Sun Feb 29 21:34:34 2004 Owen Taylor * glib/gmain.[ch]: Add g_main_depth() (Request from diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d8b81262c..fa93b826a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Feb 29 21:42:47 2004 Owen Taylor + + * glib/gmain.c: Fix leftover references to + g_main_context_depth() in docs. + Sun Feb 29 21:34:34 2004 Owen Taylor * glib/gmain.[ch]: Add g_main_depth() (Request from diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d8b81262c..fa93b826a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Feb 29 21:42:47 2004 Owen Taylor + + * glib/gmain.c: Fix leftover references to + g_main_context_depth() in docs. + Sun Feb 29 21:34:34 2004 Owen Taylor * glib/gmain.[ch]: Add g_main_depth() (Request from diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d8b81262c..fa93b826a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Feb 29 21:42:47 2004 Owen Taylor + + * glib/gmain.c: Fix leftover references to + g_main_context_depth() in docs. + Sun Feb 29 21:34:34 2004 Owen Taylor * glib/gmain.[ch]: Add g_main_depth() (Request from diff --git a/glib/gmain.c b/glib/gmain.c index 28325a062..a0ad76466 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -1785,7 +1785,7 @@ get_depth_pointer (void) * control the main loop. You might think you can simply use an idle * function to make the call to free_allocated_memory(), but that * doesn't work, since the idle function could be called from a - * recursive callback. This can be fixed by using g_main_context_depth() + * recursive callback. This can be fixed by using g_main_depth() * * * gpointer @@ -1793,7 +1793,7 @@ get_depth_pointer (void) * { * FreeListBlock *block = g_new (FreeListBlock, 1);\ * block->mem = g_malloc (size); - * block->depth = g_main_context_depth (NULL); + * block->depth = g_main_depth (); * free_list = g_list_prepend (free_list, block); * return block->mem; * } @@ -1803,7 +1803,7 @@ get_depth_pointer (void) * { * GList *l; * - * int depth = g_main_context_depth(); + * int depth = g_main_depth (); * for (l = free_list; l; ); * { * GList *next = l->next; @@ -1820,13 +1820,13 @@ get_depth_pointer (void) * } * * - * There is a temptation to use g_main_context_depth() to solve + * There is a temptation to use g_main_depth() to solve * problems with reentrancy. For instance, while waiting for data * to be received from the network in response to a menu item, * the menu item might be selected again. It might seem that * one could write: * - * if (g_main_context_depth(NULL) > 1) + * if (g_main_depth () > 1) * return; * * This should be avoided since the user then sees selecting the