gtk+ r20197 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue May 27 23:02:02 2008
New Revision: 20197
URL: http://svn.gnome.org/viewvc/gtk+?rev=20197&view=rev

Log:
Fixes


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkaccelgroup.c
   trunk/gtk/gtktreeview.c

Modified: trunk/gtk/gtkaccelgroup.c
==============================================================================
--- trunk/gtk/gtkaccelgroup.c	(original)
+++ trunk/gtk/gtkaccelgroup.c	Tue May 27 23:02:02 2008
@@ -397,10 +397,10 @@
 
 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 @@
     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;
       }

Modified: trunk/gtk/gtktreeview.c
==============================================================================
--- trunk/gtk/gtktreeview.c	(original)
+++ trunk/gtk/gtktreeview.c	Tue May 27 23:02:02 2008
@@ -13889,13 +13889,14 @@
  * @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,