diff options
| author | Kristian Rietveld <kris@gtk.org> | 2002-03-16 23:30:44 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2002-03-16 23:30:44 +0000 |
| commit | bd7678c78dd4dae87276c5b8783927461f78117e (patch) | |
| tree | 16ec6317c7fc1574c2e6e4ee8e755050036a8c7b /gtk/gtktreemodelsort.c | |
| parent | 071df50f9e6837b543da9d1867cb64f72b0cd2ab (diff) | |
| download | gtk+-bd7678c78dd4dae87276c5b8783927461f78117e.tar.gz | |
just return when we have an input_only window (fix by Owen Taylor)
Sat Mar 16 23:54:56 2002 Kristian Rietveld <kris@gtk.org>
* gdk/x11/gdkwindow-x11.c (gdk_window_set_static_bit_gravity): just
return when we have an input_only window (fix by Owen Taylor)
* gtk/gtktreeprivate.h (struct _GtkTreeViewPrivate): add
scroll_sync_timer
* gtk/gtktreeview.c (install_scroll_sync_handler): new function,
(scroll_sync_handler): ditto,
(gtk_tree_view_unrealize): take scroll_sync_timer into account
(gtk_tree_view_row_deleted): install scroll_sync_timer instead of
calling top_row_to_dy/dy_to_top_row directly
-- this greatly speeds up clearing the model (#73199)
* gtk/gtktreemodelsort.c
(gtk_tree_model_sort_convert_path_to_child_path): fix up this function,
for some reason I really screwed it up (fixes #74663)
Diffstat (limited to 'gtk/gtktreemodelsort.c')
| -rw-r--r-- | gtk/gtktreemodelsort.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index 6ae397e683..1869090759 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -1964,14 +1964,16 @@ gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sor for (i = 0; i < gtk_tree_path_get_depth (sorted_path); i++) { if ((level == NULL) || - (level->array->len > sorted_indices[i])) + (level->array->len <= sorted_indices[i])) { gtk_tree_path_free (retval); return NULL; } if (g_array_index (level->array, SortElt, sorted_indices[i]).children == NULL) gtk_tree_model_sort_build_level (tree_model_sort, level, &g_array_index (level->array, SortElt, sorted_indices[i])); + if (level == NULL) + break; gtk_tree_path_append_index (retval, g_array_index (level->array, SortElt, i).offset); } |