diff options
| author | Padraig O'Briain <padraigo@src.gnome.org> | 2002-11-19 13:16:02 +0000 |
|---|---|---|
| committer | Padraig O'Briain <padraigo@src.gnome.org> | 2002-11-19 13:16:02 +0000 |
| commit | 8eb8a6dddc40e89e914b38b585a969294e8fecd3 (patch) | |
| tree | 214b87559c7b6c6c3f3ed9f66968fbc1107f455b | |
| parent | d327ee35d3bf43987deab4c98aa5f18aafeab416 (diff) | |
| download | nautilus-8eb8a6dddc40e89e914b38b585a969294e8fecd3.tar.gz | |
Add CLEANFILES so that make clean deletes $(server_DATA) and
* components/text/Makefile.am:
* components/throbber/Makefile.am:
* components/tree/Makefile.am:
Add CLEANFILES so that make clean deletes $(server_DATA) and
$(server_DATA).in
This change should have been made on September 20th
* libnautilus-private/nautilus-icon-container.c (button_press_event):
Get double_click_time from GtkSettings property instead of using
hardcoded value.
This fixes bug #92372.
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | components/text/Makefile.am | 1 | ||||
| -rw-r--r-- | components/throbber/Makefile.am | 1 | ||||
| -rw-r--r-- | components/tree/Makefile.am | 1 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-container.c | 12 |
5 files changed, 26 insertions, 5 deletions
@@ -1,3 +1,19 @@ +2002-11-19 Padraig O'Briain <padraig.obriain@sun.com> + + * components/text/Makefile.am: + * components/throbber/Makefile.am: + * components/tree/Makefile.am: + Add CLEANFILES so that make clean deletes $(server_DATA) and + $(server_DATA).in + + This change should have been made on September 20th + + * libnautilus-private/nautilus-icon-container.c (button_press_event): + Get double_click_time from GtkSettings property instead of using + hardcoded value. + + This fixes bug #92372. + 2002-11-13 Diego Gonzalez <diego@pemas.net> * libnautilus-private/nautilus-theme.[c-h]: diff --git a/components/text/Makefile.am b/components/text/Makefile.am index f75de1671..82558ed1f 100644 --- a/components/text/Makefile.am +++ b/components/text/Makefile.am @@ -34,3 +34,4 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files) @INTLTOOL_SERVER_RULE@ EXTRA_DIST = $(server_in_files) $(nautilus_text_view_SOURCES) +CLEANFILES = $(server_DATA) $(server_DATA).in diff --git a/components/throbber/Makefile.am b/components/throbber/Makefile.am index 92aede743..3405b68a8 100644 --- a/components/throbber/Makefile.am +++ b/components/throbber/Makefile.am @@ -31,3 +31,4 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files) @INTLTOOL_SERVER_RULE@ EXTRA_DIST = $(server_in_files) +CLEANFILES = $(server_DATA) $(server_DATA).in diff --git a/components/tree/Makefile.am b/components/tree/Makefile.am index 0f9bd1a9c..9e6e6da4b 100644 --- a/components/tree/Makefile.am +++ b/components/tree/Makefile.am @@ -38,3 +38,4 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files) @INTLTOOL_SERVER_RULE@ EXTRA_DIST = $(server_in_files) +CLEANFILES = $(server_DATA) $(server_DATA).in diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index 29e92b8aa..307b3b505 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -57,9 +57,6 @@ /* Interval for updating the rubberband selection, in milliseconds. */ #define RUBBERBAND_TIMEOUT_INTERVAL 10 -/* Internal double click time constant */ -#define DOUBLE_CLICK_TIME 500000 - /* Initial unpositioned icon value */ #define ICON_UNPOSITIONED_VALUE -1 @@ -2563,10 +2560,15 @@ button_press_event (GtkWidget *widget, gint64 current_time; static gint64 last_click_time = 0; static gint click_count = 0; - + gint double_click_time; + + g_object_get (G_OBJECT (gtk_widget_get_settings (widget)), + "gtk-double-click-time", &double_click_time, + NULL); + /* Determine click count */ current_time = eel_get_system_time (); - if (current_time - last_click_time < DOUBLE_CLICK_TIME) { + if (current_time - last_click_time < double_click_time * 1000) { click_count++; } else { click_count = 0; |