Update xsettings name.

2001-12-09  Anders Carlsson  <andersca@gnu.org>

	* gdk/x11/gdkevents-x11.c: Update xsettings name.

	* gtk/gtkdnd.c (gtk_drag_check_threshold): Use the
	gtk-dnd-drag-threshold GtkSetting.

	* gtk/gtksettings.c (gtk_settings_class_init): Add
	setting for dnd drag threshold.

diff --git a/ChangeLog b/ChangeLog
index b450a5dcb164b02bb3884bfb38aaaf1a9ac24aa8..16104c32f030ae44c301acde206f7de65db05b5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-12-09  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/x11/gdkevents-x11.c: Update xsettings name.
+
+       * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the
+       gtk-dnd-drag-threshold GtkSetting.
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Add 
+       setting for dnd drag threshold.
+
 2001-12-09  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c: Add docs.
@@ -32,6 +42,7 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
+>>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b450a5dcb164b02bb3884bfb38aaaf1a9ac24aa8..16104c32f030ae44c301acde206f7de65db05b5b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+2001-12-09  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/x11/gdkevents-x11.c: Update xsettings name.
+
+       * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the
+       gtk-dnd-drag-threshold GtkSetting.
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Add 
+       setting for dnd drag threshold.
+
 2001-12-09  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c: Add docs.
@@ -32,6 +42,7 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
+>>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b450a5dcb164b02bb3884bfb38aaaf1a9ac24aa8..16104c32f030ae44c301acde206f7de65db05b5b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2001-12-09  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/x11/gdkevents-x11.c: Update xsettings name.
+
+       * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the
+       gtk-dnd-drag-threshold GtkSetting.
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Add 
+       setting for dnd drag threshold.
+
 2001-12-09  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c: Add docs.
@@ -32,6 +42,7 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
+>>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b450a5dcb164b02bb3884bfb38aaaf1a9ac24aa8..16104c32f030ae44c301acde206f7de65db05b5b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+2001-12-09  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/x11/gdkevents-x11.c: Update xsettings name.
+
+       * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the
+       gtk-dnd-drag-threshold GtkSetting.
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Add 
+       setting for dnd drag threshold.
+
 2001-12-09  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c: Add docs.
@@ -32,6 +42,7 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
+>>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b450a5dcb164b02bb3884bfb38aaaf1a9ac24aa8..16104c32f030ae44c301acde206f7de65db05b5b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+2001-12-09  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/x11/gdkevents-x11.c: Update xsettings name.
+
+       * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the
+       gtk-dnd-drag-threshold GtkSetting.
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Add 
+       setting for dnd drag threshold.
+
 2001-12-09  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c: Add docs.
@@ -32,6 +42,7 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
+>>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b450a5dcb164b02bb3884bfb38aaaf1a9ac24aa8..16104c32f030ae44c301acde206f7de65db05b5b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2001-12-09  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/x11/gdkevents-x11.c: Update xsettings name.
+
+       * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the
+       gtk-dnd-drag-threshold GtkSetting.
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Add 
+       setting for dnd drag threshold.
+
 2001-12-09  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c: Add docs.
@@ -32,6 +42,7 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
+>>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b450a5dcb164b02bb3884bfb38aaaf1a9ac24aa8..16104c32f030ae44c301acde206f7de65db05b5b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2001-12-09  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/x11/gdkevents-x11.c: Update xsettings name.
+
+       * gtk/gtkdnd.c (gtk_drag_check_threshold): Use the
+       gtk-dnd-drag-threshold GtkSetting.
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Add 
+       setting for dnd drag threshold.
+
 2001-12-09  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c: Add docs.
@@ -32,6 +42,7 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
+>>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE

diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 8ba6d3f72cc7246c7c611af5910eb478f40b9d52..bb62f04ad9e7af1244f8bc3bea391398102b1e61 100644 (file)
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -2057,7 +2057,7 @@ static struct
   const char *gdk_name;
 } settings_map[] = {
   { "Net/DoubleClickTime", "gtk-double-click-timeout" },
-  { "Net/DragThreshold", "gtk-drag-threshold" },
+  { "Net/DndDragThreshold", "gtk-dnd-drag-threshold" },
   { "Gtk/ColorPalette", "gtk-color-palette" },
   { "Gtk/ToolbarStyle", "gtk-toolbar-style" },
   { "Gtk/ToolbarIconSize", "gtk-toolbar-icon-size" },

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 7e4edbf85cf21dac8a9bce60d47f1265d49e9876..b1122cae7c5f3b5a9585e27f181ad51b27c819ee 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -3129,8 +3129,12 @@ gtk_drag_check_threshold (GtkWidget *widget,
                          gint       current_x,
                          gint       current_y)
 {
-#define DRAG_THRESHOLD 8
+  gint drag_threshold;
 
-  return (ABS (current_x - start_x) > DRAG_THRESHOLD ||
-         ABS (current_y - start_y) > DRAG_THRESHOLD);
+  g_object_get (gtk_widget_get_settings (widget),
+               "gtk-dnd-drag-threshold", &drag_threshold,
+               NULL);
+  
+  return (ABS (current_x - start_x) > drag_threshold ||
+         ABS (current_y - start_y) > drag_threshold);
 }

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 6090ea2c01649a6be5976447a4d46548d6ab590e..2b1487eea1e5b264afea9ee7984ebdad54ecbdfd 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -29,7 +29,8 @@ enum {
   PROP_SPLIT_CURSOR,
   PROP_THEME_NAME,
   PROP_KEY_THEME_NAME,
-  PROP_MENU_BAR_ACCEL
+  PROP_MENU_BAR_ACCEL,
+  PROP_DND_DRAG_THRESHOLD
 };
 
 
@@ -197,8 +198,17 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                   "F10",
                                                                   G_PARAM_READWRITE),
                                              NULL);
-
   g_assert (result == PROP_MENU_BAR_ACCEL);
+
+  result = settings_install_property_parser (class,
+                                            g_param_spec_int ("gtk-dnd-drag-threshold",
+                                                              _("Drag threshold"),
+                                                              _("Number of pixels the cursor can move before dragging"),
+                                                              1, G_MAXINT, 8,
+                                                               G_PARAM_READWRITE),
+                                            NULL);
+  g_assert (result == PROP_DND_DRAG_THRESHOLD);
+  
 }
 
 static void