glib/gmain.c remove references to deprecated functions in docs and warning

2002-02-02  Manish Singh  <yosh@gimp.org>

        * glib/gmain.c
        * glib/gtree.c: remove references to deprecated functions in docs
        and warning message.

diff --git a/ChangeLog b/ChangeLog
index 72a23ce..5e94f3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-02  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmain.c
+       * glib/gtree.c: remove references to deprecated functions in docs
+       and warning message.
+
 2002-01-31  jacob berkman  <jacob@ximian.com>
 
        * glib-gettextize.in:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 72a23ce..5e94f3a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2002-02-02  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmain.c
+       * glib/gtree.c: remove references to deprecated functions in docs
+       and warning message.
+
 2002-01-31  jacob berkman  <jacob@ximian.com>
 
        * glib-gettextize.in:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 72a23ce..5e94f3a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-02-02  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmain.c
+       * glib/gtree.c: remove references to deprecated functions in docs
+       and warning message.
+
 2002-01-31  jacob berkman  <jacob@ximian.com>
 
        * glib-gettextize.in:

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 72a23ce..5e94f3a 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2002-02-02  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmain.c
+       * glib/gtree.c: remove references to deprecated functions in docs
+       and warning message.
+
 2002-01-31  jacob berkman  <jacob@ximian.com>
 
        * glib-gettextize.in:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 72a23ce..5e94f3a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-02-02  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmain.c
+       * glib/gtree.c: remove references to deprecated functions in docs
+       and warning message.
+
 2002-01-31  jacob berkman  <jacob@ximian.com>
 
        * glib-gettextize.in:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 72a23ce..5e94f3a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-02-02  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmain.c
+       * glib/gtree.c: remove references to deprecated functions in docs
+       and warning message.
+
 2002-01-31  jacob berkman  <jacob@ximian.com>
 
        * glib-gettextize.in:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 72a23ce..5e94f3a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-02-02  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmain.c
+       * glib/gtree.c: remove references to deprecated functions in docs
+       and warning message.
+
 2002-01-31  jacob berkman  <jacob@ximian.com>
 
        * glib-gettextize.in:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 72a23ce..5e94f3a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-02-02  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmain.c
+       * glib/gtree.c: remove references to deprecated functions in docs
+       and warning message.
+
 2002-01-31  jacob berkman  <jacob@ximian.com>
 
        * glib-gettextize.in:

diff --git a/glib/gmain.c b/glib/gmain.c
index cc1b02a..822282a 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -2295,7 +2295,7 @@ g_main_context_iteration (GMainContext *context, gboolean may_block)
  * g_main_loop_new:
  * @context: a #GMainContext  (if %NULL, the default context will be used).
  * @is_running: set to %TRUE to indicate that the loop is running. This
- * is not very important since calling g_main_run() will set this to
+ * is not very important since calling g_main_loop_run() will set this to
  * %TRUE anyway.
  * 
  * Creates a new #GMainLoop structure.
@@ -2380,7 +2380,7 @@ g_main_loop_unref (GMainLoop *loop)
  * g_main_loop_run:
  * @loop: a #GMainLoop
  * 
- * Runs a main loop until g_main_quit() is called on the loop.
+ * Runs a main loop until g_main_loop_quit() is called on the loop.
  * If this is called for the thread of the loop's #GMainContext,
  * it will process events from the loop, otherwise it will
  * simply wait.
@@ -2438,8 +2438,8 @@ g_main_loop_run (GMainLoop *loop)
 
   if (loop->context->in_check_or_prepare)
     {
-      g_warning ("g_main_run(): called recursively from within a source's check() or "
-                "prepare() member, iteration not possible.");
+      g_warning ("g_main_loop_run(): called recursively from within a source's"
+                "check() or prepare() member, iteration not possible.");
       return;
     }
 
@@ -2486,7 +2486,7 @@ g_main_loop_quit (GMainLoop *loop)
  * g_main_loop_is_running:
  * @loop: a #GMainLoop.
  * 
- * Checks to see if the main loop is currently being run via g_main_run().
+ * Checks to see if the main loop is currently being run via g_main_loop_run().
  * 
  * Return value: %TRUE if the mainloop is currently being run.
  **/

diff --git a/glib/gtree.c b/glib/gtree.c
index 0c414ff..2e0351f 100644 (file)
--- a/glib/gtree.c
+++ b/glib/gtree.c
@@ -524,8 +524,7 @@ g_tree_traverse (GTree         *tree,
  * must return exactly the same value as would be returned by the comparison 
  * function, for each pair of tree nodes, or the search will not work.
  * 
- * To search for a specific value, you can use g_tree_foreach() or 
- * g_tree_traverse().
+ * To search for a specific value, you can use g_tree_foreach().
  *
  * Return value: the value corresponding to the found key, or %NULL if the key 
  * is not found.