diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2012-04-11 10:50:02 -0400 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2012-04-11 11:36:41 -0400 |
| commit | 13982305a26865d0f13196044223138324aa8823 (patch) | |
| tree | 88605da1dfd58616282cddecc94627a05a755b4a /libnautilus-private | |
| parent | aab313755af30fa63bf2c653400743fb87f7c027 (diff) | |
| download | nautilus-13982305a26865d0f13196044223138324aa8823.tar.gz | |
all: don't use eel_get_system_time()
Use g_get_monotonic_time() instead.
Diffstat (limited to 'libnautilus-private')
| -rw-r--r-- | libnautilus-private/nautilus-dnd.c | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-container.c | 4 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-dnd.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libnautilus-private/nautilus-dnd.c b/libnautilus-private/nautilus-dnd.c index 72cde45ed..5ed52f0a4 100644 --- a/libnautilus-private/nautilus-dnd.c +++ b/libnautilus-private/nautilus-dnd.c @@ -916,7 +916,7 @@ nautilus_drag_autoscroll_start (NautilusDragInfo *drag_info, if (nautilus_drag_autoscroll_in_scroll_region (widget)) { if (drag_info->auto_scroll_timeout_id == 0) { drag_info->waiting_to_autoscroll = TRUE; - drag_info->start_auto_scroll_in = eel_get_system_time() + drag_info->start_auto_scroll_in = g_get_monotonic_time () + AUTOSCROLL_INITIAL_DELAY; drag_info->auto_scroll_timeout_id = g_timeout_add diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index fea75b631..7179f5f08 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -4349,7 +4349,7 @@ nautilus_icon_container_did_not_drag (NautilusIconContainer *container, g_object_get (G_OBJECT (gtk_widget_get_settings (GTK_WIDGET (container))), "gtk-double-click-time", &double_click_time, NULL); - current_time = eel_get_system_time (); + current_time = g_get_monotonic_time (); if (current_time - last_click_time < double_click_time * 1000) { click_count++; } else { @@ -4397,7 +4397,7 @@ clicked_within_double_click_interval (NautilusIconContainer *container) g_object_get (G_OBJECT (gtk_widget_get_settings (GTK_WIDGET (container))), "gtk-double-click-time", &double_click_time, NULL); - current_time = eel_get_system_time (); + current_time = g_get_monotonic_time (); if (current_time - last_click_time < double_click_time * 1000) { click_count++; } else { diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c index c1146a9fc..1f8b101a0 100644 --- a/libnautilus-private/nautilus-icon-dnd.c +++ b/libnautilus-private/nautilus-icon-dnd.c @@ -702,7 +702,7 @@ auto_scroll_timeout_callback (gpointer data) container = NAUTILUS_ICON_CONTAINER (widget); if (container->details->dnd_info->drag_info.waiting_to_autoscroll - && container->details->dnd_info->drag_info.start_auto_scroll_in > eel_get_system_time()) { + && container->details->dnd_info->drag_info.start_auto_scroll_in > g_get_monotonic_time ()) { /* not yet */ return TRUE; } |