fix warning. (gtk_tree_view_search_iter): fix warning, #85884

Fri Jul  5 02:50:24 2002  Jonathan Blandford  <jrb@gnome.org>

	* gtk/gtktreeview.c (gtk_tree_view_collapse_all): fix warning.
	(gtk_tree_view_search_iter): fix warning, #85884

	* gtk/gtktreestore.c (gtk_tree_store_get_flags): change return
	value to GtkTreeModelFlags to fix compiler warning, #85883

	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_flags): change
	return value to GtkTreeModelFlags to fix compiler warning, #85882

	* gtk/gtktreemodel.c (gtk_tree_path_prepend_index): fix compiler
	warning, #85881

diff --git a/ChangeLog b/ChangeLog
index f449b79de645e1067cd45a23c7cdf9629fe40161..a9b497cdb9e326d4ee8c82654e01f7607ce1d4a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Fri Jul  5 02:50:24 2002  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_collapse_all): fix warning.
+       (gtk_tree_view_search_iter): fix warning, #85884
+
+       * gtk/gtktreestore.c (gtk_tree_store_get_flags): change return
+       value to GtkTreeModelFlags to fix compiler warning, #85883
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_flags): change
+       return value to GtkTreeModelFlags to fix compiler warning, #85882
+
+       * gtk/gtktreemodel.c (gtk_tree_path_prepend_index): fix compiler
+       warning, #85881
+
 Fri Jul  5 12:51:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        Merge from HEAD.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f449b79de645e1067cd45a23c7cdf9629fe40161..a9b497cdb9e326d4ee8c82654e01f7607ce1d4a2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+Fri Jul  5 02:50:24 2002  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_collapse_all): fix warning.
+       (gtk_tree_view_search_iter): fix warning, #85884
+
+       * gtk/gtktreestore.c (gtk_tree_store_get_flags): change return
+       value to GtkTreeModelFlags to fix compiler warning, #85883
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_flags): change
+       return value to GtkTreeModelFlags to fix compiler warning, #85882
+
+       * gtk/gtktreemodel.c (gtk_tree_path_prepend_index): fix compiler
+       warning, #85881
+
 Fri Jul  5 12:51:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        Merge from HEAD.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f449b79de645e1067cd45a23c7cdf9629fe40161..a9b497cdb9e326d4ee8c82654e01f7607ce1d4a2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+Fri Jul  5 02:50:24 2002  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_collapse_all): fix warning.
+       (gtk_tree_view_search_iter): fix warning, #85884
+
+       * gtk/gtktreestore.c (gtk_tree_store_get_flags): change return
+       value to GtkTreeModelFlags to fix compiler warning, #85883
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_flags): change
+       return value to GtkTreeModelFlags to fix compiler warning, #85882
+
+       * gtk/gtktreemodel.c (gtk_tree_path_prepend_index): fix compiler
+       warning, #85881
+
 Fri Jul  5 12:51:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        Merge from HEAD.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f449b79de645e1067cd45a23c7cdf9629fe40161..a9b497cdb9e326d4ee8c82654e01f7607ce1d4a2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+Fri Jul  5 02:50:24 2002  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_collapse_all): fix warning.
+       (gtk_tree_view_search_iter): fix warning, #85884
+
+       * gtk/gtktreestore.c (gtk_tree_store_get_flags): change return
+       value to GtkTreeModelFlags to fix compiler warning, #85883
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_flags): change
+       return value to GtkTreeModelFlags to fix compiler warning, #85882
+
+       * gtk/gtktreemodel.c (gtk_tree_path_prepend_index): fix compiler
+       warning, #85881
+
 Fri Jul  5 12:51:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        Merge from HEAD.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f449b79de645e1067cd45a23c7cdf9629fe40161..a9b497cdb9e326d4ee8c82654e01f7607ce1d4a2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+Fri Jul  5 02:50:24 2002  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_collapse_all): fix warning.
+       (gtk_tree_view_search_iter): fix warning, #85884
+
+       * gtk/gtktreestore.c (gtk_tree_store_get_flags): change return
+       value to GtkTreeModelFlags to fix compiler warning, #85883
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_flags): change
+       return value to GtkTreeModelFlags to fix compiler warning, #85882
+
+       * gtk/gtktreemodel.c (gtk_tree_path_prepend_index): fix compiler
+       warning, #85881
+
 Fri Jul  5 12:51:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        Merge from HEAD.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f449b79de645e1067cd45a23c7cdf9629fe40161..a9b497cdb9e326d4ee8c82654e01f7607ce1d4a2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+Fri Jul  5 02:50:24 2002  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_collapse_all): fix warning.
+       (gtk_tree_view_search_iter): fix warning, #85884
+
+       * gtk/gtktreestore.c (gtk_tree_store_get_flags): change return
+       value to GtkTreeModelFlags to fix compiler warning, #85883
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_flags): change
+       return value to GtkTreeModelFlags to fix compiler warning, #85882
+
+       * gtk/gtktreemodel.c (gtk_tree_path_prepend_index): fix compiler
+       warning, #85881
+
 Fri Jul  5 12:51:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        Merge from HEAD.

diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index e1b7030f7af72831be2619905e821da541558b92..a749cec3dabed5daec7062f664eb201ea0db0e97 100644 (file)
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -284,7 +284,11 @@ void
 gtk_tree_path_prepend_index (GtkTreePath *path,
                             gint       index)
 {
-  gint *new_indices = g_new (gint, ++path->depth);
+  gint *new_indices;
+
+  (path->depth)++;
+  new_indices = g_new (gint, path->depth);
+
   if (path->indices == NULL)
     {
       path->indices = new_indices;

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index cc888a25f832ca9d0ffe2b41f9e268efaf99a3d5..373edbb6b3b0c22d21a6e3165dae01c14894f8c4 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -141,7 +141,7 @@ static void gtk_tree_model_sort_rows_reordered        (GtkTreeModel          *s_
                                                       gpointer               data);
 
 /* TreeModel interface */
-static guint        gtk_tree_model_sort_get_flags          (GtkTreeModel          *tree_model);
+static GtkTreeModelFlags gtk_tree_model_sort_get_flags     (GtkTreeModel          *tree_model);
 static gint         gtk_tree_model_sort_get_n_columns      (GtkTreeModel          *tree_model);
 static GType        gtk_tree_model_sort_get_column_type    (GtkTreeModel          *tree_model,
                                                             gint                   index);
@@ -829,7 +829,7 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
 }
 
 /* Fulfill our model requirements */
-static guint
+static GtkTreeModelFlags
 gtk_tree_model_sort_get_flags (GtkTreeModel *tree_model)
 {
   g_return_val_if_fail (GTK_IS_TREE_MODEL_SORT (tree_model), 0);

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index e26f1fa41f5471bf9d178d4d3f050e1fca7568ba..14c8e5a2c01bc6db31710f52173a6eb16d6d8073 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -35,7 +35,7 @@ static void         gtk_tree_store_drag_source_init(GtkTreeDragSourceIface *ifac
 static void         gtk_tree_store_drag_dest_init  (GtkTreeDragDestIface   *iface);
 static void         gtk_tree_store_sortable_init   (GtkTreeSortableIface   *iface);
 static void         gtk_tree_store_finalize        (GObject           *object);
-static guint        gtk_tree_store_get_flags       (GtkTreeModel      *tree_model);
+static GtkTreeModelFlags gtk_tree_store_get_flags  (GtkTreeModel      *tree_model);
 static gint         gtk_tree_store_get_n_columns   (GtkTreeModel      *tree_model);
 static GType        gtk_tree_store_get_column_type (GtkTreeModel      *tree_model,
                                                    gint               index);
@@ -467,7 +467,7 @@ gtk_tree_store_finalize (GObject *object)
  */
 
 
-static guint
+static GtkTreeModelFlags
 gtk_tree_store_get_flags (GtkTreeModel *tree_model)
 {
   g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0);

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 6343223ef18dbc7e19adb84c982cdad44d1ebb1d..afd7d0b0d4a2011e9a4fc2289d09764c35c0a21d 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -8816,7 +8816,7 @@ gtk_tree_view_collapse_all (GtkTreeView *tree_view)
   GtkRBTree *tree;
   GtkRBNode *node;
   GtkTreePath *path;
-  guint *indices;
+  gint *indices;
 
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
@@ -10773,9 +10773,6 @@ gtk_tree_view_search_iter (GtkTreeModel     *model,
     }
   while (1);
 
-  if (path)
-    gtk_tree_path_free (path);
-
   return FALSE;
 }