save last minute changes before committing.
Wed Jan 30 20:15:49 2002 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute changes before committing.
This commit is contained in:
committed by
Jonathan Blandford
parent
78d39ef504
commit
9725d9958e
@ -1,3 +1,10 @@
|
|||||||
|
Wed Jan 30 20:15:49 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
|
||||||
|
changes before committing.
|
||||||
|
|
||||||
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
|
||||||
|
|
||||||
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
||||||
|
|||||||
@ -1,3 +1,10 @@
|
|||||||
|
Wed Jan 30 20:15:49 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
|
||||||
|
changes before committing.
|
||||||
|
|
||||||
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
|
||||||
|
|
||||||
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
||||||
|
|||||||
@ -1,3 +1,10 @@
|
|||||||
|
Wed Jan 30 20:15:49 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
|
||||||
|
changes before committing.
|
||||||
|
|
||||||
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
|
||||||
|
|
||||||
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
||||||
|
|||||||
@ -1,3 +1,10 @@
|
|||||||
|
Wed Jan 30 20:15:49 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
|
||||||
|
changes before committing.
|
||||||
|
|
||||||
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
|
||||||
|
|
||||||
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
||||||
|
|||||||
@ -1,3 +1,10 @@
|
|||||||
|
Wed Jan 30 20:15:49 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
|
||||||
|
changes before committing.
|
||||||
|
|
||||||
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
|
||||||
|
|
||||||
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
||||||
|
|||||||
@ -1,3 +1,10 @@
|
|||||||
|
Wed Jan 30 20:15:49 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
|
||||||
|
changes before committing.
|
||||||
|
|
||||||
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
|
||||||
|
|
||||||
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
||||||
|
|||||||
@ -1,3 +1,10 @@
|
|||||||
|
Wed Jan 30 20:15:49 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
|
||||||
|
changes before committing.
|
||||||
|
|
||||||
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
|
||||||
|
|
||||||
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
Wed Jan 30 18:46:14 2002 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
|
||||||
|
|||||||
@ -802,6 +802,8 @@ gtk_list_store_set_valist (GtkListStore *list_store,
|
|||||||
|
|
||||||
column = va_arg (var_args, gint);
|
column = va_arg (var_args, gint);
|
||||||
|
|
||||||
|
if (GTK_LIST_STORE_IS_SORTED (list_store))
|
||||||
|
{
|
||||||
if (list_store->sort_column_id != -1)
|
if (list_store->sort_column_id != -1)
|
||||||
{
|
{
|
||||||
GtkTreeDataSortHeader *header;
|
GtkTreeDataSortHeader *header;
|
||||||
@ -813,9 +815,9 @@ gtk_list_store_set_valist (GtkListStore *list_store,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
g_return_if_fail (list_store->default_sort_func != NULL);
|
|
||||||
func = list_store->default_sort_func;
|
func = list_store->default_sort_func;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (func != gtk_tree_data_list_compare_func)
|
if (func != gtk_tree_data_list_compare_func)
|
||||||
maybe_need_sort = TRUE;
|
maybe_need_sort = TRUE;
|
||||||
|
|||||||
@ -910,13 +910,15 @@ gtk_tree_store_set_valist (GtkTreeStore *tree_store,
|
|||||||
gint column;
|
gint column;
|
||||||
gboolean emit_signal = FALSE;
|
gboolean emit_signal = FALSE;
|
||||||
gboolean maybe_need_sort = FALSE;
|
gboolean maybe_need_sort = FALSE;
|
||||||
GtkTreeIterCompareFunc func;
|
GtkTreeIterCompareFunc func = NULL;
|
||||||
|
|
||||||
g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
|
g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
|
||||||
g_return_if_fail (VALID_ITER (iter, tree_store));
|
g_return_if_fail (VALID_ITER (iter, tree_store));
|
||||||
|
|
||||||
column = va_arg (var_args, gint);
|
column = va_arg (var_args, gint);
|
||||||
|
|
||||||
|
if (GTK_TREE_STORE_IS_SORTED (tree_store))
|
||||||
|
{
|
||||||
if (tree_store->sort_column_id != -1)
|
if (tree_store->sort_column_id != -1)
|
||||||
{
|
{
|
||||||
GtkTreeDataSortHeader *header;
|
GtkTreeDataSortHeader *header;
|
||||||
@ -928,9 +930,9 @@ gtk_tree_store_set_valist (GtkTreeStore *tree_store,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
g_return_if_fail (tree_store->default_sort_func != NULL);
|
|
||||||
func = tree_store->default_sort_func;
|
func = tree_store->default_sort_func;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (func != gtk_tree_data_list_compare_func)
|
if (func != gtk_tree_data_list_compare_func)
|
||||||
maybe_need_sort = TRUE;
|
maybe_need_sort = TRUE;
|
||||||
|
|||||||
Reference in New Issue
Block a user