Index: shell/e-shell-window.c
===================================================================
--- shell/e-shell-window.c	(revision 37360)
+++ shell/e-shell-window.c	(working copy)
@@ -926,7 +926,7 @@
 
 	if (GTK_WIDGET_REALIZED(widget) && !(gdk_window_get_state(widget->window) & GDK_WINDOW_STATE_MAXIMIZED)) {
 		/* update the size storage timer */
-		self->priv->store_window_size_timer = g_timeout_add (1000, (GSourceFunc)store_window_size, self);
+		self->priv->store_window_size_timer = g_timeout_add_seconds (1, (GSourceFunc)store_window_size, self);
 	}
 
 	if (GTK_WIDGET_CLASS (e_shell_window_parent_class)->size_allocate) {
Index: shell/e-shell-nm.c
===================================================================
--- shell/e-shell-nm.c	(revision 37360)
+++ shell/e-shell-nm.c	(working copy)
@@ -71,7 +71,7 @@
 		dbus_connection_unref (dbus_connection);
 		dbus_connection = NULL;
 
-		g_timeout_add (3000, reinit_dbus, shell);
+		g_timeout_add_seconds (3, reinit_dbus, shell);
 
 		return DBUS_HANDLER_RESULT_HANDLED;
 	}
Index: plugins/bbdb/bbdb.h
===================================================================
--- plugins/bbdb/bbdb.h	(revision 37360)
+++ plugins/bbdb/bbdb.h	(working copy)
@@ -33,7 +33,7 @@
 
 
 /* How often to poll the buddy list for changes (every two minutes) */
-#define BBDB_BLIST_CHECK_INTERVAL (2 * 60 * 1000)
+#define BBDB_BLIST_CHECK_INTERVAL (2 * 60)
 
 /* bbdb.c */
 EBook *bbdb_open_addressbook (int type);
Index: plugins/bbdb/bbdb.c
===================================================================
--- plugins/bbdb/bbdb.c	(revision 37360)
+++ plugins/bbdb/bbdb.c	(working copy)
@@ -115,7 +115,7 @@
 		if (bbdb_check_gaim_enabled ())
 			bbdb_sync_buddy_list_check ();
 
-		g_timeout_add (BBDB_BLIST_CHECK_INTERVAL,
+		g_timeout_add_seconds (BBDB_BLIST_CHECK_INTERVAL,
 			       (GSourceFunc) bbdb_timeout,
 			       NULL);
 	}
Index: plugins/publish-calendar/publish-calendar.c
===================================================================
--- plugins/publish-calendar/publish-calendar.c	(revision 37360)
+++ plugins/publish-calendar/publish-calendar.c	(working copy)
@@ -336,11 +336,11 @@
 	/* Set the timeout for now+frequency */
 	switch (uri->publish_frequency) {
 	case URI_PUBLISH_DAILY:
-		id = g_timeout_add (24 * 60 * 60 * 1000, (GSourceFunc) publish, uri);
+		id = g_timeout_add_seconds (24 * 60 * 60, (GSourceFunc) publish, uri);
 		g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id));
 		break;
 	case URI_PUBLISH_WEEKLY:
-		id = g_timeout_add (7 * 24 * 60 * 60 * 1000, (GSourceFunc) publish, uri);
+		id = g_timeout_add_seconds (7 * 24 * 60 * 60, (GSourceFunc) publish, uri);
 		g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id));
 		break;
 	}
@@ -403,7 +403,7 @@
 			publish (uri);
 			add_timeout (uri);
 		} else {
-			id = g_timeout_add (((24 * 60 * 60) - elapsed) * 1000, (GSourceFunc) publish, uri);
+			id = g_timeout_add_seconds (24 * 60 * 60 - elapsed, (GSourceFunc) publish, uri);
 			g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id));
 			break;
 		}
@@ -413,7 +413,7 @@
 			publish (uri);
 			add_timeout (uri);
 		} else {
-			id = g_timeout_add (((7 * 24 * 60 * 60) - elapsed) * 1000, (GSourceFunc) publish, uri);
+			id = g_timeout_add_seconds (7 * 24 * 60 * 60 - elapsed, (GSourceFunc) publish, uri);
 			g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id));
 			break;
 		}
Index: mail/em-folder-tree.c
===================================================================
--- mail/em-folder-tree.c	(revision 37360)
+++ mail/em-folder-tree.c	(working copy)
@@ -2641,5 +2641,5 @@
 	if (priv->save_state_id != 0)
 		return;
 
-	priv->save_state_id = g_timeout_add (1000, (GSourceFunc) emft_save_state, emft);
+	priv->save_state_id = g_timeout_add_seconds (1, (GSourceFunc) emft_save_state, emft);
 }
Index: mail/mail-send-recv.c
===================================================================
--- mail/mail-send-recv.c	(revision 37360)
+++ mail/mail-send-recv.c	(working copy)
@@ -1027,7 +1027,7 @@
 	}
 	info->period = period;
 	if (check && info->timeout_id == 0)
-		info->timeout_id = g_timeout_add(info->period*1000, auto_timeout, info);
+		info->timeout_id = g_timeout_add_seconds(info->period, auto_timeout, info);
 }
 
 static void
Index: mail/mail-folder-cache.c
===================================================================
--- mail/mail-folder-cache.c	(revision 37360)
+++ mail/mail-folder-cache.c	(working copy)
@@ -935,8 +935,8 @@
 		count_sent = getenv("EVOLUTION_COUNT_SENT") != NULL;
 		count_trash = getenv("EVOLUTION_COUNT_TRASH") != NULL;
 		buf = getenv ("EVOLUTION_PING_TIMEOUT");
-		timeout = buf ? strtoul (buf, NULL, 10) * 1000 : 600000;
-		ping_id = g_timeout_add (timeout, ping_cb, NULL);
+		timeout = buf ? strtoul (buf, NULL, 10) : 600;
+		ping_id = g_timeout_add_seconds (timeout, ping_cb, NULL);
 	}
 
 	si = g_hash_table_lookup(stores, store);
Index: composer/e-composer-autosave.c
===================================================================
--- composer/e-composer-autosave.c	(revision 37360)
+++ composer/e-composer-autosave.c	(working copy)
@@ -28,7 +28,7 @@
 
 #define AUTOSAVE_PREFIX		".evolution-composer.autosave"
 #define AUTOSAVE_SEED		AUTOSAVE_PREFIX "-XXXXXX"
-#define AUTOSAVE_INTERVAL	60000  /* 60 seconds */
+#define AUTOSAVE_INTERVAL	60  /* 60 seconds */
 
 typedef struct _AutosaveState AutosaveState;
 
@@ -222,7 +222,7 @@
 		composer_autosave_notify, NULL);
 
 	if (autosave_source_id == 0)
-		autosave_source_id = g_timeout_add (
+		autosave_source_id = g_timeout_add_seconds (
 			AUTOSAVE_INTERVAL, (GSourceFunc)
 			composer_autosave_timeout, NULL);
 }
Index: e-util/e-logger.c
===================================================================
--- e-util/e-logger.c	(revision 37360)
+++ e-util/e-logger.c	(working copy)
@@ -36,7 +36,7 @@
 #include "e-mktemp.h"
 
 /* 5 Minutes */
-#define TIMEOUT_INTERVAL	300000 
+#define TIMEOUT_INTERVAL	300
 
 #define E_LOGGER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -219,7 +219,7 @@
 	if (logger->priv->timer)
 		return;
 
-	logger->priv->timer = g_timeout_add (
+	logger->priv->timer = g_timeout_add_seconds (
 		TIMEOUT_INTERVAL, (GSourceFunc) flush_logfile, logger);
 }
 
Index: e-util/gconf-bridge.c
===================================================================
--- e-util/gconf-bridge.c	(revision 37360)
+++ e-util/gconf-bridge.c	(working copy)
@@ -645,8 +645,8 @@
         return FALSE;
 }
 
-#define WINDOW_BINDING_SYNC_DELAY 1000 /* Delay before syncing new window
-                                          dimensions to GConf, in ms */
+#define WINDOW_BINDING_SYNC_DELAY 1 /* Delay before syncing new window
+                                          dimensions to GConf, in s */
 
 /* Called when the window han been resized or moved */
 static gboolean
@@ -657,7 +657,7 @@
         /* Schedule a sync */
         if (binding->sync_timeout_id == 0) {
                 binding->sync_timeout_id =
-                        g_timeout_add (WINDOW_BINDING_SYNC_DELAY,
+                        g_timeout_add_seconds (WINDOW_BINDING_SYNC_DELAY,
                                        (GSourceFunc)
                                           window_binding_perform_scheduled_sync,
                                        binding);
Index: widgets/text/e-text.c
===================================================================
--- widgets/text/e-text.c	(revision 37360)
+++ widgets/text/e-text.c	(working copy)
@@ -2456,7 +2456,7 @@
 		{
 				if ( text->tooltip_count == 0 && text->clip) {
 					if (!text->tooltip_timeout)
-						text->tooltip_timeout = g_timeout_add (2000, _do_tooltip, text);
+						text->tooltip_timeout = g_timeout_add_seconds (2, _do_tooltip, text);
 				}
 				text->tooltip_count ++;
 		}
Index: widgets/table/e-table-search.c
===================================================================
--- widgets/table/e-table-search.c	(revision 37360)
+++ widgets/table/e-table-search.c	(working copy)
@@ -100,7 +100,7 @@
 add_timeout (ETableSearch *ets)
 {
 	drop_timeout (ets);
-	ets->priv->timeout_id = g_timeout_add (1000, ets_accept, ets);
+	ets->priv->timeout_id = g_timeout_add_seconds (1, ets_accept, ets);
 }
 
 static void
Index: calendar/gui/alarm-notify/alarm-queue.c
===================================================================
--- calendar/gui/alarm-notify/alarm-queue.c	(revision 37360)
+++ calendar/gui/alarm-notify/alarm-queue.c	(working copy)
@@ -1868,7 +1868,7 @@
 	}
 
 	/* install timeout handler (every 30 mins) for not missing the midnight refresh */
-	g_timeout_add (1800000, (GSourceFunc) check_midnight_refresh, NULL);
+	g_timeout_add_seconds (1800, (GSourceFunc) check_midnight_refresh, NULL);
 
 #ifdef HAVE_LIBNOTIFY
 	notify_init("Evolution Alarms");
Index: calendar/gui/alarm-notify/alarm.c
===================================================================
--- calendar/gui/alarm-notify/alarm.c	(revision 37360)
+++ calendar/gui/alarm-notify/alarm.c	(working copy)
@@ -153,7 +153,7 @@
 	g_message ("Setting timeout for %d %lu %lu", diff, ar->trigger, now);
 	g_message (" %s", ctime (&ar->trigger));
 	g_message (" %s", ctime (&now));
-	timeout_id = g_timeout_add (diff * 1000, alarm_ready_cb, NULL);
+	timeout_id = g_timeout_add_seconds (diff, alarm_ready_cb, NULL);
 
 }
 
Index: calendar/gui/e-meeting-time-sel.c
===================================================================
--- calendar/gui/e-meeting-time-sel.c	(revision 37360)
+++ calendar/gui/e-meeting-time-sel.c	(working copy)
@@ -2916,7 +2916,7 @@
 }
 
 
-#define REFRESH_PAUSE 5000
+#define REFRESH_PAUSE 5
 
 static gboolean
 free_busy_timeout_refresh (gpointer data)
@@ -2950,7 +2950,7 @@
 		g_source_remove (mts->fb_refresh_not);
 	}
 
-	mts->fb_refresh_not = g_timeout_add (REFRESH_PAUSE,
+	mts->fb_refresh_not = g_timeout_add_seconds (REFRESH_PAUSE,
 					     free_busy_timeout_refresh,
 					     data);
 }
