Use g_timeout_add_seconds where appropriate

Use g_timeout_add_seconds instead of g_timeout_add where appropriate.
Fix bug #574033.

Signed-off-by: Cosimo Cecchi <cosimoc@gnome.org>

4 files changed, 13 insertions, 13 deletions

diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index d83a1b6a9..7bf4c12e9 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -145,7 +145,7 @@
 #define SNAP_CEIL_VERTICAL(y) SNAP_VERTICAL (ceil, y)
 
 /* Copied from NautilusIconContainer */
-#define NAUTILUS_ICON_CONTAINER_SEARCH_DIALOG_TIMEOUT 5000
+#define NAUTILUS_ICON_CONTAINER_SEARCH_DIALOG_TIMEOUT 5
 
 /* Copied from NautilusFile */
 #define UNDEFINED_TIME ((time_t) (-1))
@@ -4903,7 +4903,7 @@ nautilus_icon_container_search_preedit_changed (GtkIMContext *im_context,
 	if (container->details->typeselect_flush_timeout) {
 		g_source_remove (container->details->typeselect_flush_timeout);
 		container->details->typeselect_flush_timeout =
-			g_timeout_add (NAUTILUS_ICON_CONTAINER_SEARCH_DIALOG_TIMEOUT,
+			g_timeout_add_seconds (NAUTILUS_ICON_CONTAINER_SEARCH_DIALOG_TIMEOUT,
 				(GSourceFunc) nautilus_icon_container_search_entry_flush_timeout,
 				container);
 	}
@@ -5100,7 +5100,7 @@ nautilus_icon_container_search_scroll_event (GtkWidget *widget,
 	if (retval && container->details->typeselect_flush_timeout) {
 		g_source_remove (container->details->typeselect_flush_timeout);
 		container->details->typeselect_flush_timeout =
-			g_timeout_add (NAUTILUS_ICON_CONTAINER_SEARCH_DIALOG_TIMEOUT,
+			g_timeout_add_seconds (NAUTILUS_ICON_CONTAINER_SEARCH_DIALOG_TIMEOUT,
 				(GSourceFunc) nautilus_icon_container_search_entry_flush_timeout,
 				container);
 	}
@@ -5161,7 +5161,7 @@ nautilus_icon_container_search_key_press_event (GtkWidget *widget,
 	if (retval && container->details->typeselect_flush_timeout) {
 		g_source_remove (container->details->typeselect_flush_timeout);
 		container->details->typeselect_flush_timeout =
-			g_timeout_add (NAUTILUS_ICON_CONTAINER_SEARCH_DIALOG_TIMEOUT,
+			g_timeout_add_seconds (NAUTILUS_ICON_CONTAINER_SEARCH_DIALOG_TIMEOUT,
 				(GSourceFunc) nautilus_icon_container_search_entry_flush_timeout,
 				container);
 	}
@@ -5189,7 +5189,7 @@ nautilus_icon_container_search_init (GtkWidget   *entry,
 	{
 		g_source_remove (container->details->typeselect_flush_timeout);
 		container->details->typeselect_flush_timeout =
-			g_timeout_add (NAUTILUS_ICON_CONTAINER_SEARCH_DIALOG_TIMEOUT,
+			g_timeout_add_seconds (NAUTILUS_ICON_CONTAINER_SEARCH_DIALOG_TIMEOUT,
 				(GSourceFunc) nautilus_icon_container_search_entry_flush_timeout,
 				container);
 	}
@@ -5301,7 +5301,7 @@ nautilus_icon_container_real_start_interactive_search (NautilusIconContainer *co
 	}
 
 	container->details->typeselect_flush_timeout =
-		g_timeout_add (NAUTILUS_ICON_CONTAINER_SEARCH_DIALOG_TIMEOUT,
+		g_timeout_add_seconds (NAUTILUS_ICON_CONTAINER_SEARCH_DIALOG_TIMEOUT,
 			(GSourceFunc) nautilus_icon_container_search_entry_flush_timeout,
 			container);
 
diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c
index f064135fb..75be343c6 100644
--- a/libnautilus-private/nautilus-thumbnails.c
+++ b/libnautilus-private/nautilus-thumbnails.c
@@ -979,7 +979,7 @@ thumbnail_thread_start (gpointer data)
 				   info->image_uri);
 #endif
 			/* Reschedule thumbnailing via a change notification */
-			g_timeout_add (1000, thumbnail_thread_notify_file_changed,
+			g_timeout_add_seconds (1, thumbnail_thread_notify_file_changed,
 				       g_strdup (info->image_uri));
  			continue;
 		}
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.c b/libnautilus-private/nautilus-tree-view-drag-dest.c
index e74726871..ff77d48b0 100644
--- a/libnautilus-private/nautilus-tree-view-drag-dest.c
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.c
@@ -44,7 +44,7 @@
 
 #define AUTO_SCROLL_MARGIN 20
 
-#define HOVER_EXPAND_TIMEOUT 1000
+#define HOVER_EXPAND_TIMEOUT 1
 
 struct _NautilusTreeViewDragDestDetails {
 	GtkTreeView *tree_view;
@@ -491,7 +491,7 @@ drag_motion_callback (GtkWidget *widget,
 		if (dest->details->expand_id == 0 && drop_path != NULL) {
 			gtk_tree_model_get_iter (model, &drop_iter, drop_path);
 			if (gtk_tree_model_iter_has_child (model, &drop_iter)) {
-				dest->details->expand_id = g_timeout_add (HOVER_EXPAND_TIMEOUT,
+				dest->details->expand_id = g_timeout_add_seconds (HOVER_EXPAND_TIMEOUT,
 									  expand_timeout,
 									  dest->details->tree_view);
 			}
diff --git a/libnautilus-private/nautilus-users-groups-cache.c b/libnautilus-private/nautilus-users-groups-cache.c
index 18ae3bde3..c0f313af0 100644
--- a/libnautilus-private/nautilus-users-groups-cache.c
+++ b/libnautilus-private/nautilus-users-groups-cache.c
@@ -32,9 +32,9 @@
 
 typedef struct _ExpiringCache ExpiringCache;
 
-/* times in milliseconds */
-#define USERS_CACHE_EXPIRE_TIME   (60 * 1000)
-#define GROUPS_CACHE_EXPIRE_TIME  (60 * 1000)
+/* times in seconds */
+#define USERS_CACHE_EXPIRE_TIME   60
+#define GROUPS_CACHE_EXPIRE_TIME  60
 
 /* cache of users' names */
 static ExpiringCache *users_cache = NULL;
@@ -136,7 +136,7 @@ expiring_cache_get_value (ExpiringCache *cache, guint key)
 	                                   NULL, (gpointer) &entry)) {
 		entry = expiring_cache_entry_new (cache, key, cache->get_value_func (key));
 		g_hash_table_insert (cache->cached_values, GSIZE_TO_POINTER (key), entry);
-		g_timeout_add (cache->expire_time, (GSourceFunc) cb_cache_entry_expired, entry);
+		g_timeout_add_seconds (cache->expire_time, (GSourceFunc) cb_cache_entry_expired, entry);
 	}
 
 	return entry->value;