diff --git a/ChangeLog b/ChangeLog
index 933f07d9a7..aadd669b5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan  4 16:52:14 2005  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event):
+	only reorder on button 1, part of #141937
+
 Tue Jan  4 11:36:43 2005  Søren Sandmann  <sandmann@redhat.com>
 
 	Bug 162112.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 933f07d9a7..aadd669b5e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Jan  4 16:52:14 2005  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event):
+	only reorder on button 1, part of #141937
+
 Tue Jan  4 11:36:43 2005  Søren Sandmann  <sandmann@redhat.com>
 
 	Bug 162112.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 933f07d9a7..aadd669b5e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Jan  4 16:52:14 2005  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event):
+	only reorder on button 1, part of #141937
+
 Tue Jan  4 11:36:43 2005  Søren Sandmann  <sandmann@redhat.com>
 
 	Bug 162112.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 933f07d9a7..aadd669b5e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Jan  4 16:52:14 2005  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event):
+	only reorder on button 1, part of #141937
+
 Tue Jan  4 11:36:43 2005  Søren Sandmann  <sandmann@redhat.com>
 
 	Bug 162112.
diff --git a/docs/reference/gtk/tmpl/gtkitemfactory.sgml b/docs/reference/gtk/tmpl/gtkitemfactory.sgml
index 1195901c39..c018caa96b 100644
--- a/docs/reference/gtk/tmpl/gtkitemfactory.sgml
+++ b/docs/reference/gtk/tmpl/gtkitemfactory.sgml
@@ -37,8 +37,8 @@ and #GtkActionGroup.
 
 @path: The id of the message. In #GtkItemFactory this will be a path
   from a #GtkItemFactoryEntry, in #GtkActionGroup, it will be a label
-  or tooltip from a #GtkActionEntry. 
-@func_data: user data passed in when registering the function 
+  or tooltip from a #GtkActionEntry.
+@func_data: user data passed in when registering the function
 @Returns: the translated message
 
 
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index e2c5e1e4d2..843de6d986 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1048,7 +1048,8 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
   g_return_val_if_fail (event != NULL, FALSE);
 
   if (event->type == GDK_BUTTON_PRESS &&
-      column->reorderable)
+      column->reorderable &&
+      ((GdkEventButton *)event)->button == 1)
     {
       column->maybe_reordered = TRUE;
       gdk_window_get_pointer (widget->window,