Commit e1fc6b42 authored by Federico Mena Quintero's avatar Federico Mena Quintero Committed by Federico Mena Quintero
Browse files

Merged from gtk-2-6:

2005-03-30  Federico Mena Quintero  <federico@ximian.com>

	Merged from gtk-2-6:

	Fix #170755:

	* gtk/gtktreeview.c (gtk_tree_view_row_changed): Only stop editing
	if the row which changed is the same as the row being edited.
parent 78c230c0
2005-03-30 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
Fix #170755:
* gtk/gtktreeview.c (gtk_tree_view_row_changed): Only stop editing
if the row which changed is the same as the row being edited.
2005-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
......
2005-03-30 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
Fix #170755:
* gtk/gtktreeview.c (gtk_tree_view_row_changed): Only stop editing
if the row which changed is the same as the row being edited.
2005-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
......
2005-03-30 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
Fix #170755:
* gtk/gtktreeview.c (gtk_tree_view_row_changed): Only stop editing
if the row which changed is the same as the row being edited.
2005-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
......
......@@ -7042,6 +7042,7 @@ gtk_tree_view_row_changed (GtkTreeModel *model,
gboolean free_path = FALSE;
gint vertical_separator;
GList *list;
GtkTreePath *cursor_path;
g_return_if_fail (path != NULL || iter != NULL);
......@@ -7050,9 +7051,18 @@ gtk_tree_view_row_changed (GtkTreeModel *model,
*/
return;
if (tree_view->priv->edited_column)
if (tree_view->priv->cursor != NULL)
cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
else
cursor_path = NULL;
if (tree_view->priv->edited_column &&
(cursor_path == NULL || gtk_tree_path_compare (cursor_path, path) == 0))
gtk_tree_view_stop_editing (tree_view, TRUE);
if (cursor_path != NULL)
gtk_tree_path_free (cursor_path);
gtk_widget_style_get (GTK_WIDGET (data), "vertical-separator", &vertical_separator, NULL);
if (path == NULL)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment