Mark g_tree_traverse() as deprecated. (#65343)

        * glib/gtree.h: Mark g_tree_traverse() as deprecated. (#65343)

        * glib/gtree.c (g_tree_traverse): Explain the deprecation in
        some detail.

diff --git a/ChangeLog b/ChangeLog
index 4b177143c892ca821c4a061dbbe0da8f0b499931..1a3557f373d2d0b52b842080d087da009e6fe120 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gtree.h: Mark g_tree_traverse() as deprecated. (#65343)
+       
+       * glib/gtree.c (g_tree_traverse): Explain the deprecation in 
+       some detail.
+
 Mon Nov 26 09:42:24 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: provide GLIB_SIZEOF_SIZE_T.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4b177143c892ca821c4a061dbbe0da8f0b499931..1a3557f373d2d0b52b842080d087da009e6fe120 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2001-11-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gtree.h: Mark g_tree_traverse() as deprecated. (#65343)
+       
+       * glib/gtree.c (g_tree_traverse): Explain the deprecation in 
+       some detail.
+
 Mon Nov 26 09:42:24 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: provide GLIB_SIZEOF_SIZE_T.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4b177143c892ca821c4a061dbbe0da8f0b499931..1a3557f373d2d0b52b842080d087da009e6fe120 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2001-11-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gtree.h: Mark g_tree_traverse() as deprecated. (#65343)
+       
+       * glib/gtree.c (g_tree_traverse): Explain the deprecation in 
+       some detail.
+
 Mon Nov 26 09:42:24 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: provide GLIB_SIZEOF_SIZE_T.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 4b177143c892ca821c4a061dbbe0da8f0b499931..1a3557f373d2d0b52b842080d087da009e6fe120 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+2001-11-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gtree.h: Mark g_tree_traverse() as deprecated. (#65343)
+       
+       * glib/gtree.c (g_tree_traverse): Explain the deprecation in 
+       some detail.
+
 Mon Nov 26 09:42:24 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: provide GLIB_SIZEOF_SIZE_T.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4b177143c892ca821c4a061dbbe0da8f0b499931..1a3557f373d2d0b52b842080d087da009e6fe120 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2001-11-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gtree.h: Mark g_tree_traverse() as deprecated. (#65343)
+       
+       * glib/gtree.c (g_tree_traverse): Explain the deprecation in 
+       some detail.
+
 Mon Nov 26 09:42:24 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: provide GLIB_SIZEOF_SIZE_T.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4b177143c892ca821c4a061dbbe0da8f0b499931..1a3557f373d2d0b52b842080d087da009e6fe120 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2001-11-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gtree.h: Mark g_tree_traverse() as deprecated. (#65343)
+       
+       * glib/gtree.c (g_tree_traverse): Explain the deprecation in 
+       some detail.
+
 Mon Nov 26 09:42:24 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: provide GLIB_SIZEOF_SIZE_T.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4b177143c892ca821c4a061dbbe0da8f0b499931..1a3557f373d2d0b52b842080d087da009e6fe120 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2001-11-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gtree.h: Mark g_tree_traverse() as deprecated. (#65343)
+       
+       * glib/gtree.c (g_tree_traverse): Explain the deprecation in 
+       some detail.
+
 Mon Nov 26 09:42:24 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: provide GLIB_SIZEOF_SIZE_T.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4b177143c892ca821c4a061dbbe0da8f0b499931..1a3557f373d2d0b52b842080d087da009e6fe120 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2001-11-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gtree.h: Mark g_tree_traverse() as deprecated. (#65343)
+       
+       * glib/gtree.c (g_tree_traverse): Explain the deprecation in 
+       some detail.
+
 Mon Nov 26 09:42:24 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: provide GLIB_SIZEOF_SIZE_T.

diff --git a/glib/gtree.c b/glib/gtree.c
index a5737f8307092b2fa4e71cdfe8a7067ab62339a2..96a1b3421316c23849d4a2b777e8e5c524cf92c2 100644 (file)
--- a/glib/gtree.c
+++ b/glib/gtree.c
@@ -467,7 +467,10 @@ g_tree_foreach (GTree         *tree,
  * @user_data: user data to pass to the function.
  * 
  * Calls the given function for each node in the GTree. This function is
- * deprecated, use g_tree_foreach() instead.
+ * deprecated, since the order of a balanced tree is somewhat arbitrary.
+ * If you just want to visit all nodes in some order, use g_tree_foreach() 
+ * instead. If you really need to visit nodes in a specific order, consider
+ * using an <link linkend="glib-N-ary-Trees">N-ary Tree</link>.
  **/
 void
 g_tree_traverse (GTree         *tree,

diff --git a/glib/gtree.h b/glib/gtree.h
index ba5102c6e7c17f7028c352b8d0cc764cbcc4f464..b6894d5b3376760432aa437c285e120fe67b37b9 100644 (file)
--- a/glib/gtree.h
+++ b/glib/gtree.h
@@ -66,10 +66,14 @@ gboolean g_tree_lookup_extended (GTree            *tree,
 void     g_tree_foreach         (GTree            *tree,
                                  GTraverseFunc    func,
                                  gpointer         user_data);
+
+#ifndef G_DISABLE_DEPRECATED
 void     g_tree_traverse        (GTree            *tree,
                                  GTraverseFunc     traverse_func,
                                  GTraverseType     traverse_type,
                                  gpointer          user_data);
+#endif /* G_DISABLE_DEPRECATED */
+
 gpointer g_tree_search          (GTree            *tree,
                                  GCompareFunc      search_func,
                                  gconstpointer     user_data);