diff --git a/ChangeLog b/ChangeLog
index 39a6273c51..9145740b4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-06-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row): 
+	Check start_button_mask before starting a drag.  (#149058, 
+	Andreas Volz)
+
 	* gtk/gtkfilesystemunix.c: Support .hidden files.  (#129170,
 	Sayamindu Dasgupta, patch by Jan Arne Petersen)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 39a6273c51..9145740b4b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-06-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row): 
+	Check start_button_mask before starting a drag.  (#149058, 
+	Andreas Volz)
+
 	* gtk/gtkfilesystemunix.c: Support .hidden files.  (#129170,
 	Sayamindu Dasgupta, patch by Jan Arne Petersen)
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 39a6273c51..9145740b4b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2005-06-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row): 
+	Check start_button_mask before starting a drag.  (#149058, 
+	Andreas Volz)
+
 	* gtk/gtkfilesystemunix.c: Support .hidden files.  (#129170,
 	Sayamindu Dasgupta, patch by Jan Arne Petersen)
 
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 196cf895de..874413c746 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3236,15 +3236,12 @@ gtk_tree_view_vertical_autoscroll (GtkTreeView *tree_view)
 
   /* see if we are near the edge. */
   offset = y - (visible_rect.y + 2 * SCROLL_EDGE_SIZE);
-  g_print ("offset1 %d\n", offset);
   if (offset > 0)
     {
       offset = y - (visible_rect.y + visible_rect.height - 2 * SCROLL_EDGE_SIZE);
-      g_print ("offset2 %d\n", offset);
       if (offset < 0)
 	return;
     }
-  g_print ("offset3 %d\n", offset);
 
   value = CLAMP (tree_view->priv->vadjustment->value + offset, 0.0,
 		 tree_view->priv->vadjustment->upper - tree_view->priv->vadjustment->page_size);
@@ -5933,9 +5930,8 @@ gtk_tree_view_maybe_begin_dragging_row (GtkTreeView      *tree_view,
 					   path))
     goto out;
 
-  /* FIXME Check whether we're a start button, if not return FALSE and
-   * free path
-   */
+  if (!(GDK_BUTTON1_MASK << (button - 1) & di->start_button_mask))
+    goto out;
 
   /* Now we can begin the drag */