From 14a5e057c721828ccb91519c225d1cd228f0a237 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Mon, 29 Oct 2001 20:43:01 +0000 Subject: [PATCH] Darn. I can't believe this took this long to fix. Mon Oct 29 15:41:58 2001 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. I can't believe this took this long to fix. --- ChangeLog | 5 +++ ChangeLog.pre-2-0 | 5 +++ ChangeLog.pre-2-10 | 5 +++ ChangeLog.pre-2-2 | 5 +++ ChangeLog.pre-2-4 | 5 +++ ChangeLog.pre-2-6 | 5 +++ ChangeLog.pre-2-8 | 5 +++ docs/reference/gtk/tmpl/gtk-unused.sgml | 48 ++++++++++++++++++++ docs/reference/gtk/tmpl/gtkcontainer.sgml | 1 + docs/reference/gtk/tmpl/gtkmenuitem.sgml | 4 +- docs/reference/gtk/tmpl/gtkmenushell.sgml | 2 +- docs/reference/gtk/tmpl/gtkpreview.sgml | 2 - docs/reference/gtk/tmpl/gtktipsquery.sgml | 55 ----------------------- gtk/gtktreemodelsort.c | 2 +- 14 files changed, 88 insertions(+), 61 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd74dc9521..eadf46f555 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 29 15:41:58 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. + I can't believe this took this long to fix. + Mon Oct 29 13:54:49 2001 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bd74dc9521..eadf46f555 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Mon Oct 29 15:41:58 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. + I can't believe this took this long to fix. + Mon Oct 29 13:54:49 2001 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bd74dc9521..eadf46f555 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Oct 29 15:41:58 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. + I can't believe this took this long to fix. + Mon Oct 29 13:54:49 2001 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bd74dc9521..eadf46f555 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Oct 29 15:41:58 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. + I can't believe this took this long to fix. + Mon Oct 29 13:54:49 2001 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bd74dc9521..eadf46f555 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Oct 29 15:41:58 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. + I can't believe this took this long to fix. + Mon Oct 29 13:54:49 2001 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bd74dc9521..eadf46f555 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Oct 29 15:41:58 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. + I can't believe this took this long to fix. + Mon Oct 29 13:54:49 2001 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bd74dc9521..eadf46f555 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Oct 29 15:41:58 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. + I can't believe this took this long to fix. + Mon Oct 29 13:54:49 2001 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 77182774b5..91412b12e8 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -271,6 +271,20 @@ has the focus. + + + + + +@obj: + + + + + + +@klass: + Test whether a GtkObject's arguments have been prepared. @@ -328,6 +342,27 @@ Get the array of signals defined for this object. + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + @@ -393,6 +428,12 @@ The last structured enumerated type value. + + + + + + @@ -2512,6 +2553,13 @@ Creates a border around the arrows of a #GtkSpinButton. The type of border is de @width: @height: + + + + + +@Returns: + Private: print debugging information while doing a gtk_object_ref() or diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml index 4dc152d062..de1877ace7 100644 --- a/docs/reference/gtk/tmpl/gtkcontainer.sgml +++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml @@ -44,6 +44,7 @@ Does the same as gtk_container_get_border_width(). + diff --git a/docs/reference/gtk/tmpl/gtkmenuitem.sgml b/docs/reference/gtk/tmpl/gtkmenuitem.sgml index 9b7f8a6701..76b4e86398 100644 --- a/docs/reference/gtk/tmpl/gtkmenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkmenuitem.sgml @@ -122,7 +122,7 @@ Emits the "activate" signal on the given item Emits the "toggle_size_request" signal on the given item. -@menu_item: the menu item +@menu_item: the menu item @requisition: the requisition to use as signal data. @@ -131,7 +131,7 @@ Emits the "toggle_size_request" signal on the given item. Emits the "toggle_size_allocate" signal on the given item. -@menu_item: the menu item. +@menu_item: the menu item. @allocation: the allocation to use as signal data. diff --git a/docs/reference/gtk/tmpl/gtkmenushell.sgml b/docs/reference/gtk/tmpl/gtkmenushell.sgml index de3e66a932..fc64ef33df 100644 --- a/docs/reference/gtk/tmpl/gtkmenushell.sgml +++ b/docs/reference/gtk/tmpl/gtkmenushell.sgml @@ -94,7 +94,7 @@ Selects the menu item from the menu shell. Deselects the currently selected item from the menu shell, if any. -@menu_shell: a #GtkMenuShell. +@menu_shell: a #GtkMenuShell. diff --git a/docs/reference/gtk/tmpl/gtkpreview.sgml b/docs/reference/gtk/tmpl/gtkpreview.sgml index 7fa78ca6b7..3ec4eff4a0 100644 --- a/docs/reference/gtk/tmpl/gtkpreview.sgml +++ b/docs/reference/gtk/tmpl/gtkpreview.sgml @@ -63,8 +63,6 @@ an application.) -@visual: -@cmap: @lookup: @gamma: diff --git a/docs/reference/gtk/tmpl/gtktipsquery.sgml b/docs/reference/gtk/tmpl/gtktipsquery.sgml index eb2467af9f..a792ce84a9 100644 --- a/docs/reference/gtk/tmpl/gtktipsquery.sgml +++ b/docs/reference/gtk/tmpl/gtktipsquery.sgml @@ -97,61 +97,6 @@ the pointer has no tooltip. beneath the pointer has no tooltip. - - - - - -@obj: - - - - - - - -@obj: - - - - - - - - - - - - - - -@Returns: - - - - - - - -@klass: - - - - - - - -@klass: - - - - - - - -@obj: - - Emitted when the query is started. diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index c353ebccb0..7945e694ff 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -1412,7 +1412,7 @@ gtk_tree_model_sort_sort_level (GtkTreeModelSort *tree_model_sort, /* isn't supposed to happen */ break; - new_order[i] = j; + new_order[j] = i; /* copy ... */ memcpy (&g_array_index (new_array, SortElt, j), elt1, sizeof (SortElt));