diff --git a/ChangeLog b/ChangeLog
index 6a763ff79d..f73df51ad6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+	Make drag reordering work properly for columns other than the
+	first.  (#315054, Dan Winship)
+	
 	* gtk/gtkfontsel.c (gtk_font_selection_set_font_name): Handle 
 	invalid fontnames better. (#136926, Michael R. Walton)
 	
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6a763ff79d..f73df51ad6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-09-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+	Make drag reordering work properly for columns other than the
+	first.  (#315054, Dan Winship)
+	
 	* gtk/gtkfontsel.c (gtk_font_selection_set_font_name): Handle 
 	invalid fontnames better. (#136926, Michael R. Walton)
 	
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 08d2c28752..c1867a7abb 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1053,7 +1053,7 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
       ((GdkEventButton *)event)->button == 1)
     {
       column->maybe_reordered = TRUE;
-      gdk_window_get_pointer (widget->window,
+      gdk_window_get_pointer (GTK_BUTTON (widget)->event_window,
 			      &column->drag_x,
 			      &column->drag_y,
 			      NULL);
@@ -1073,10 +1073,6 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
 				 (gint) ((GdkEventMotion *)event)->y)))
     {
       column->maybe_reordered = FALSE;
-      /* this is to change our drag_x to be relative to
-       * tree_view->priv->bin_window, instead of our window.
-       */
-      column->drag_x -= column->button->allocation.x;
       _gtk_tree_view_column_start_drag (GTK_TREE_VIEW (column->tree_view), column);
       return TRUE;
     }