Commit 3778b86c authored by Jonathan Blandford's avatar Jonathan Blandford Committed by Jonathan Blandford

sync up white space/variable names to match tree_store equiv.

Mon Jul  1 17:04:09 2002  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
	white space/variable names to match tree_store equiv.

	* gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
	set the value.
parent b0f026ae
Mon Jul 1 17:04:09 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
white space/variable names to match tree_store equiv.
* gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
set the value.
Mon Jul 01 17:19:00 2002 Bill Haneman <bill.haneman@sun.com>
* contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
......
Mon Jul 1 17:04:09 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
white space/variable names to match tree_store equiv.
* gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
set the value.
Mon Jul 01 17:19:00 2002 Bill Haneman <bill.haneman@sun.com>
* contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
......
Mon Jul 1 17:04:09 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
white space/variable names to match tree_store equiv.
* gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
set the value.
Mon Jul 01 17:19:00 2002 Bill Haneman <bill.haneman@sun.com>
* contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
......
Mon Jul 1 17:04:09 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
white space/variable names to match tree_store equiv.
* gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
set the value.
Mon Jul 01 17:19:00 2002 Bill Haneman <bill.haneman@sun.com>
* contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
......
Mon Jul 1 17:04:09 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
white space/variable names to match tree_store equiv.
* gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
set the value.
Mon Jul 01 17:19:00 2002 Bill Haneman <bill.haneman@sun.com>
* contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
......
Mon Jul 1 17:04:09 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
white space/variable names to match tree_store equiv.
* gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
set the value.
Mon Jul 01 17:19:00 2002 Bill Haneman <bill.haneman@sun.com>
* contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
......
......@@ -659,9 +659,9 @@ gtk_list_store_real_set_value (GtkListStore *list_store,
{
GtkTreeDataList *list;
GtkTreeDataList *prev;
gint old_column = column;
GValue real_value = {0, };
gboolean converted = FALSE;
gint orig_column = column;
gboolean retval = FALSE;
g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE);
......@@ -736,12 +736,13 @@ gtk_list_store_real_set_value (GtkListStore *list_store,
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
retval = TRUE;
if (converted)
g_value_unset (&real_value);
if (sort && GTK_LIST_STORE_IS_SORTED (list_store))
gtk_list_store_sort_iter_changed (list_store, iter, orig_column);
gtk_list_store_sort_iter_changed (list_store, iter, old_column);
return retval;
}
......@@ -1771,7 +1772,6 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store,
cmp_b = (* func) (GTK_TREE_MODEL (list_store), iter, &tmp_iter, data);
}
if (list_store->order == GTK_SORT_DESCENDING)
{
if (cmp_a < 0)
......
......@@ -778,11 +778,16 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
{
GtkTreeDataList *list;
GtkTreeDataList *prev;
GtkTreePath *path = NULL;
gint old_column = column;
GValue real_value = {0, };
gboolean converted = FALSE;
gboolean retval = FALSE;
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), FALSE);
g_return_val_if_fail (VALID_ITER (iter, tree_store), FALSE);
g_return_val_if_fail (column >= 0 && column < tree_store->n_columns, FALSE);
g_return_val_if_fail (G_IS_VALUE (value), FALSE);
if (! g_type_is_a (G_VALUE_TYPE (value), tree_store->column_headers[column]))
{
if (! (g_value_type_compatible (G_VALUE_TYPE (value), tree_store->column_headers[column]) &&
......@@ -808,8 +813,6 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
prev = list = G_NODE (iter->user_data)->data;
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
while (list != NULL)
{
if (column == 0)
......@@ -819,7 +822,6 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
else
_gtk_tree_data_list_value_to_node (list, value);
retval = TRUE;
gtk_tree_path_free (path);
if (converted)
g_value_unset (&real_value);
return retval;
......@@ -848,16 +850,19 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
list->next = NULL;
column --;
}
if (converted)
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
retval = TRUE;
gtk_tree_path_free (path);
if (converted)
g_value_unset (&real_value);
if (sort && GTK_TREE_STORE_IS_SORTED (tree_store))
gtk_tree_store_sort_iter_changed (tree_store, iter, old_column);
return retval;
}
......@@ -2067,7 +2072,6 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
cmp_b = (* func) (GTK_TREE_MODEL (tree_store), iter, &tmp_iter, data);
}
if (tree_store->order == GTK_SORT_DESCENDING)
{
if (cmp_a < 0)
......
......@@ -4182,8 +4182,8 @@ validate_rows (GtkTreeView *tree_view)
tree_view->priv->validate_rows_timer = 0;
}
return retval;
}
return retval;
}
static gboolean
validate_rows_handler (GtkTreeView *tree_view)
......
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