Don't mess up the column header state if the button release event is

2004-12-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event):
	Don't mess up the column header state if the button release
	event is missed.  (#159640)

ChangeLog

+2004-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+	Don't mess up the column header state if the button release
+	event is missed.  (#159640)
+
 2004-12-07  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* gtk/gtkcellview.c: (gtk_cell_view_set_background_color):
@@ -11,6 +17,10 @@
 
 2004-12-07  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+	Don't mess up the column header state if the button release
+	event is missed.  (#159640)
+
 	* docs/tools/widgets.h (enum): Add an ASIS widget size.
 
 	* docs/tools/widgets.c (get_all_widgets): Add file chooser,

ChangeLog.pre-2-10

+2004-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+	Don't mess up the column header state if the button release
+	event is missed.  (#159640)
+
 2004-12-07  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* gtk/gtkcellview.c: (gtk_cell_view_set_background_color):
@@ -11,6 +17,10 @@
 
 2004-12-07  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+	Don't mess up the column header state if the button release
+	event is missed.  (#159640)
+
 	* docs/tools/widgets.h (enum): Add an ASIS widget size.
 
 	* docs/tools/widgets.c (get_all_widgets): Add file chooser,

ChangeLog.pre-2-6

+2004-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+	Don't mess up the column header state if the button release
+	event is missed.  (#159640)
+
 2004-12-07  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* gtk/gtkcellview.c: (gtk_cell_view_set_background_color):
@@ -11,6 +17,10 @@
 
 2004-12-07  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+	Don't mess up the column header state if the button release
+	event is missed.  (#159640)
+
 	* docs/tools/widgets.h (enum): Add an ASIS widget size.
 
 	* docs/tools/widgets.c (get_all_widgets): Add file chooser,

ChangeLog.pre-2-8

+2004-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+	Don't mess up the column header state if the button release
+	event is missed.  (#159640)
+
 2004-12-07  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* gtk/gtkcellview.c: (gtk_cell_view_set_background_color):
@@ -11,6 +17,10 @@
 
 2004-12-07  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+	Don't mess up the column header state if the button release
+	event is missed.  (#159640)
+
 	* docs/tools/widgets.h (enum): Add an ASIS widget size.
 
 	* docs/tools/widgets.c (get_all_widgets): Add file chooser,

gtk/gtktreeviewcolumn.c

@@ -1058,12 +1058,12 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
       gtk_widget_grab_focus (widget);
     }
 
-  if (event->type == GDK_BUTTON_RELEASE &&
-      column->maybe_reordered)
+  if (event->type == GDK_BUTTON_RELEASE ||
+      event->type == GDK_LEAVE_NOTIFY)
     column->maybe_reordered = FALSE;
-
+  
   if (event->type == GDK_MOTION_NOTIFY &&
-      (column->maybe_reordered) &&
+      column->maybe_reordered &&
       (gtk_drag_check_threshold (widget,
 				 column->drag_x,
 				 column->drag_y,