diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-05-27 23:02:02 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-05-27 23:02:02 +0000 |
| commit | 2855f81636de924f751931115d886df8cb0f522a (patch) | |
| tree | c667fb26f1f8db6fe98949715193f9e98f67e87e | |
| parent | 8d5e58b632f0be7d1354f4b750efb4604017080e (diff) | |
| download | gtk+-2855f81636de924f751931115d886df8cb0f522a.tar.gz | |
Fixes
svn path=/trunk/; revision=20197
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | gtk/gtkaccelgroup.c | 6 | ||||
| -rw-r--r-- | gtk/gtktreeview.c | 5 |
3 files changed, 22 insertions, 6 deletions
@@ -1,6 +1,21 @@ 2008-05-27 Matthias Clasen <mclasen@redhat.com> - 106574 - Inconsistent increment behavior for gtkspinbutton + Bug 351910 – Search column setting lost + + * gtk/gtktreeview.c (gtk_tree_view_set_search_column): Clarify + the docs. Patch by Matt Barnes. + +2008-05-27 Matthias Clasen <mclasen@redhat.com> + + Bug 477278 - avoid unnecessary pointer subtraction + + * gtk/gtkaccelgroup.c (quick_accel_remove): Avoid pointer + subtraction that sparse complains about. Patch by Christian + Persch. + +2008-05-27 Matthias Clasen <mclasen@redhat.com> + + Bug 106574 - Inconsistent increment behavior for gtkspinbutton * gtk/gtkspinbutton.c (gtk_spin_button_real_value_change): Commit the entry text before doing an increment. Patch by diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index 4a121fcfba..cc7df18d02 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -397,10 +397,10 @@ quick_accel_add (GtkAccelGroup *accel_group, static void quick_accel_remove (GtkAccelGroup *accel_group, - GtkAccelGroupEntry *entry) + guint pos) { - guint pos = entry - accel_group->priv_accels; GQuark accel_quark = 0; + GtkAccelGroupEntry *entry = accel_group->priv_accels + pos; guint accel_key = entry->key.accel_key; GdkModifierType accel_mods = entry->key.accel_mods; GClosure *closure = entry->closure; @@ -577,7 +577,7 @@ gtk_accel_group_disconnect (GtkAccelGroup *accel_group, if (accel_group->priv_accels[i].closure == closure) { g_object_ref (accel_group); - quick_accel_remove (accel_group, accel_group->priv_accels + i); + quick_accel_remove (accel_group, i); g_object_unref (accel_group); return TRUE; } diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 9e676f0e36..ea25e57aff 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -13889,13 +13889,14 @@ gtk_tree_view_get_search_column (GtkTreeView *tree_view) * @column: the column of the model to search in, or -1 to disable searching * * Sets @column as the column where the interactive search code should - * search in. + * search in for the current model. * * If the search column is set, users can use the "start-interactive-search" * key binding to bring up search popup. The enable-search property controls * whether simply typing text will also start an interactive search. * - * Note that @column refers to a column of the model. + * Note that @column refers to a column of the current model. The search + * column is reset to -1 when the model is changed. */ void gtk_tree_view_set_search_column (GtkTreeView *tree_view, |