From 2cb50c9af24769841c77e093fda5c37db6d03b99 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Mon, 23 Jan 2012 23:15:44 +0100
Subject: [PATCH] scrolledwindow: Do not handle dnd-threshold=0

There's no need for it as the GtkSettings property has a lower
limit of 1.
---
 gtk/gtkscrolledwindow.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 91a51c7422..2bac4e6e62 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -2630,7 +2630,6 @@ gtk_scrolled_window_captured_button_press (GtkWidget *widget,
   GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
   GtkScrolledWindowPrivate *priv = scrolled_window->priv;
   GtkWidget *child;
-  gint threshold;
   GtkWidget *event_widget;
   GdkEventButton *event;
   GdkDevice *source_device;
@@ -2701,19 +2700,7 @@ gtk_scrolled_window_captured_button_press (GtkWidget *widget,
                                (GSourceFunc) gtk_scrolled_window_release_captured_events,
                                scrolled_window);
 
-  /* If there's a zero drag threshold, start the drag immediately */
-  g_object_get (gtk_widget_get_settings (widget),
-                "gtk-dnd-drag-threshold", &threshold,
-                NULL);
-  if (threshold == 0)
-    {
-      priv->in_drag = TRUE;
-
-      /* Swallow the press event */
-      return GTK_CAPTURED_EVENT_HANDLED;
-    }
-  else
-    priv->in_drag = FALSE;
+  priv->in_drag = FALSE;
 
   if (priv->kinetic_scrolling_flags & GTK_KINETIC_SCROLLING_CAPTURE_BUTTON_PRESS)
     {