Commit e05a9660 authored by Jonathan Blandford's avatar Jonathan Blandford Committed by Jonathan Blandford

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
parent c9bd72a3
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.
......
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.
......
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.
......
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.
......
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.
......
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.
......
......@@ -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;
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment