Merged from stable.

Thu Jul 17 16:11:21 2003  Kristian Rietveld  <kris@gtk.org>

	Merged from stable.

	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): stop editing
	if needed. (Fixes #115869, reported by Michael Natterer).

ChangeLog

+Thu Jul 17 16:11:21 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): stop editing
+	if needed. (Fixes #115869, reported by Michael Natterer).
+
 2003-07-15  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity.

ChangeLog.pre-2-10

+Thu Jul 17 16:11:21 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): stop editing
+	if needed. (Fixes #115869, reported by Michael Natterer).
+
 2003-07-15  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity.

ChangeLog.pre-2-4

+Thu Jul 17 16:11:21 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): stop editing
+	if needed. (Fixes #115869, reported by Michael Natterer).
+
 2003-07-15  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity.

ChangeLog.pre-2-6

+Thu Jul 17 16:11:21 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): stop editing
+	if needed. (Fixes #115869, reported by Michael Natterer).
+
 2003-07-15  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity.

ChangeLog.pre-2-8

+Thu Jul 17 16:11:21 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeview.c (gtk_tree_view_rows_reordered): stop editing
+	if needed. (Fixes #115869, reported by Michael Natterer).
+
 2003-07-15  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity.

gtk/gtktreeview.c

@@ -6529,6 +6529,9 @@ gtk_tree_view_rows_reordered (GtkTreeModel *model,
   if (tree == NULL)
     return;
 
+  if (tree_view->priv->edited_column)
+    gtk_tree_view_stop_editing (tree_view, TRUE);
+
   /* we need to be unprelighted */
   ensure_unprelighted (tree_view);