=== modified file 'src/gpm-dpms.c'
--- src/gpm-dpms.c	2008-11-06 07:20:46 +0000
+++ src/gpm-dpms.c	2008-12-19 08:16:04 +0000
@@ -53,7 +53,7 @@
 #define GPM_DPMS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_DPMS, GpmDpmsPrivate))
 
 /* until we get a nice event-emitting DPMS extension, we have to poll... */
-#define GPM_DPMS_POLL_TIME	10*1000
+#define GPM_DPMS_POLL_TIME	10
 
 struct GpmDpmsPrivate
 {
@@ -778,7 +778,7 @@
 add_poll_timer (GpmDpms *dpms,
 		glong	 timeout)
 {
-	dpms->priv->timer_id = g_timeout_add (timeout, (GSourceFunc)poll_dpms_mode, dpms);
+	dpms->priv->timer_id = g_timeout_add_seconds (timeout, (GSourceFunc)poll_dpms_mode, dpms);
 }
 
 static void

=== modified file 'src/gpm-engine.c'
--- src/gpm-engine.c	2008-11-06 07:20:46 +0000
+++ src/gpm-engine.c	2008-12-19 08:16:04 +0000
@@ -48,7 +48,7 @@
 static void     gpm_engine_finalize   (GObject	  *object);
 
 #define GPM_ENGINE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_ENGINE, GpmEnginePrivate))
-#define GPM_ENGINE_RESUME_DELAY		2*1000
+#define GPM_ENGINE_RESUME_DELAY		2
 #define GPM_ENGINE_WARN_ACCURACY	20
 
 
@@ -136,7 +136,7 @@
 		   GpmEngine   *engine)
 {
 	/* we have to delay this at resume to counteract races */
-	g_timeout_add (GPM_ENGINE_RESUME_DELAY, (GSourceFunc) gpm_engine_delayed_refresh, engine);
+	g_timeout_add_seconds (GPM_ENGINE_RESUME_DELAY, (GSourceFunc) gpm_engine_delayed_refresh, engine);
 }
 
 /**
@@ -563,7 +563,7 @@
 		egg_debug ("** EMIT: icon-changed: none");
 
 		/* we let the icon stick around for a couple of seconds */
-		g_timeout_add (1000*2, (GSourceFunc) gpm_engine_icon_clear_delay, engine);
+		g_timeout_add_seconds (2, (GSourceFunc) gpm_engine_icon_clear_delay, engine);
 
 		g_free (engine->priv->previous_icon);
 		engine->priv->previous_icon = NULL;

=== modified file 'src/gpm-feedback-widget.c'
--- src/gpm-feedback-widget.c	2008-11-06 07:20:46 +0000
+++ src/gpm-feedback-widget.c	2008-12-19 08:16:04 +0000
@@ -39,7 +39,7 @@
 
 #define GPM_FEEDBACK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_FEEDBACK, GpmFeedbackPrivate))
 
-#define GPM_FEEDBACK_TIMOUT		2000	/* ms */
+#define GPM_FEEDBACK_TIMEOUT		2	/* s */
 
 struct GpmFeedbackPrivate
 {
@@ -186,7 +186,7 @@
 	feedback->priv->refcount = gpm_refcount_new ();
 	g_signal_connect (feedback->priv->refcount, "refcount-zero",
 			  G_CALLBACK (gpm_feedback_close_window), feedback);
-	gpm_refcount_set_timeout (feedback->priv->refcount, GPM_FEEDBACK_TIMOUT);
+	gpm_refcount_set_timeout (feedback->priv->refcount, GPM_FEEDBACK_TIMEOUT);
 
 	/* initialise the window */
 	feedback->priv->xml = glade_xml_new (GPM_DATA "/gpm-feedback-widget.glade", NULL, NULL);

=== modified file 'src/gpm-idle.c'
--- src/gpm-idle.c	2008-11-06 07:20:46 +0000
+++ src/gpm-idle.c	2008-12-19 08:16:04 +0000
@@ -143,7 +143,7 @@
 gpm_idle_add_gpm_idle_poll_system_timer (GpmIdle *idle,
 		       glong	timeout)
 {
-	idle->priv->system_idle_timer_id = g_timeout_add (timeout, (GSourceFunc)gpm_idle_poll_system_timer, idle);
+	idle->priv->system_idle_timer_id = g_timeout_add_seconds (timeout, (GSourceFunc)gpm_idle_poll_system_timer, idle);
 }
 
 /**
@@ -171,7 +171,7 @@
 	egg_debug ("System idle timeout");
 
 	gpm_idle_remove_gpm_idle_poll_system_timer (idle);
-	gpm_idle_add_gpm_idle_poll_system_timer (idle, POLL_FREQUENCY * 1000);
+	gpm_idle_add_gpm_idle_poll_system_timer (idle, POLL_FREQUENCY);
 
 	idle->priv->system_timer_id = 0;
 	return FALSE;
@@ -210,13 +210,9 @@
 static void
 add_system_timer (GpmIdle *idle)
 {
-	guint64 msecs;
-
-	msecs = idle->priv->system_timeout * 1000;
-
 	if (idle->priv->system_timeout > 0) {
-		idle->priv->system_timer_id = g_timeout_add (msecs,
-							     (GSourceFunc)system_timer, idle);
+		idle->priv->system_timer_id = g_timeout_add_seconds (idle->priv->system_timeout,
+								     (GSourceFunc) system_timer, idle);
 	} else {
 		egg_debug ("System idle disabled");
 	}

=== modified file 'src/gpm-info.c'
--- src/gpm-info.c	2008-11-06 07:20:46 +0000
+++ src/gpm-info.c	2008-12-19 08:16:04 +0000
@@ -845,7 +845,7 @@
 		info->priv->voltage_data = gpm_array_new ();
 
 		/* set up the timer callback so we can log data */
-		g_timeout_add (GPM_INFO_DATA_POLL * 1000, gpm_info_log_do_poll, info);
+		g_timeout_add_seconds (GPM_INFO_DATA_POLL, gpm_info_log_do_poll, info);
 
 	} else {
 		info->priv->percentage_data = NULL;

=== modified file 'src/gpm-light-sensor.c'
--- src/gpm-light-sensor.c	2008-11-06 07:20:46 +0000
+++ src/gpm-light-sensor.c	2008-12-19 08:16:04 +0000
@@ -382,7 +382,7 @@
 
 		/* get poll timeout */
 		gpm_conf_get_uint (sensor->priv->conf, GPM_CONF_AMBIENT_POLL, &timeout);
-		g_timeout_add (timeout * 1000, gpm_light_sensor_poll_cb, sensor);
+		g_timeout_add_seconds (timeout, gpm_light_sensor_poll_cb, sensor);
 	}
 }
 

=== modified file 'src/gpm-main.c'
--- src/gpm-main.c	2008-11-06 07:20:46 +0000
+++ src/gpm-main.c	2008-12-19 08:16:04 +0000
@@ -246,7 +246,7 @@
 	/* Only timeout and close the mainloop if we have specified it
 	 * on the command line */
 	if (timed_exit) {
-		g_timeout_add (1000 * 20, (GSourceFunc) timed_exit_cb, loop);
+		g_timeout_add_seconds (20, (GSourceFunc) timed_exit_cb, loop);
 	}
 
 	if (immediate_exit == FALSE) {

=== modified file 'src/gpm-manager.c'
--- src/gpm-manager.c	2008-11-06 07:20:46 +0000
+++ src/gpm-manager.c	2008-12-19 08:16:04 +0000
@@ -75,7 +75,7 @@
 static void     gpm_manager_finalize	(GObject	 *object);
 
 #define GPM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_MANAGER, GpmManagerPrivate))
-#define GPM_MANAGER_RECALL_DELAY		1000*10
+#define GPM_MANAGER_RECALL_DELAY		10
 
 struct GpmManagerPrivate
 {
@@ -1258,7 +1258,7 @@
 	g_object_set_data (G_OBJECT (manager), "recall-oem-vendor", (gpointer) g_strdup (oem_vendor));
 	g_object_set_data (G_OBJECT (manager), "recall-oem-website", (gpointer) g_strdup (website));
 	/* delay by a few seconds so the panel can load */
-	g_timeout_add (GPM_MANAGER_RECALL_DELAY, (GSourceFunc) gpm_manager_perhaps_recall, manager);
+	g_timeout_add_seconds (GPM_MANAGER_RECALL_DELAY, (GSourceFunc) gpm_manager_perhaps_recall, manager);
 }
 
 /**
@@ -1551,7 +1551,7 @@
 		g_free (action);
 
 		/* wait 10 seconds for user-panic */
-		g_timeout_add (1000*10, (GSourceFunc) manager_critical_action_do, manager);
+		g_timeout_add_seconds (10, (GSourceFunc) manager_critical_action_do, manager);
 
 	} else if (kind == GPM_CELL_UNIT_KIND_UPS) {
 		title = _("UPS critically low");

=== modified file 'src/gpm-refcount.c'
--- src/gpm-refcount.c	2008-11-06 07:20:46 +0000
+++ src/gpm-refcount.c	2008-12-19 08:16:04 +0000
@@ -38,7 +38,7 @@
 
 struct GpmRefcountPrivate
 {
-	guint		 timeout; /* ms */
+	guint		 timeout; /* s */
 	guint		 refcount;
 };
 
@@ -105,7 +105,7 @@
 	g_idle_remove_by_data (refcount);
 
 	/* add ONE automatic timeout */
-	g_timeout_add (refcount->priv->timeout, gpm_refcount_auto_decrement, refcount);
+	g_timeout_add_seconds (refcount->priv->timeout, gpm_refcount_auto_decrement, refcount);
 
 	return TRUE;
 }
@@ -143,13 +143,13 @@
 	g_return_val_if_fail (refcount != NULL, FALSE);
 	g_return_val_if_fail (GPM_IS_REFCOUNT (refcount), FALSE);
 
-	if (timeout > 100000) {
+	if (timeout > 100) {
 		egg_warning ("refcount is not designed for long timeouts");
 		return FALSE;
 	}
 	if (timeout == 0) {
 		egg_warning ("refcount cannot be zero");
-		timeout = 1000;
+		timeout = 1;
 	}
 
 	refcount->priv->timeout = timeout;

=== modified file 'src/gpm-statistics-core.c'
--- src/gpm-statistics-core.c	2008-11-06 07:20:46 +0000
+++ src/gpm-statistics-core.c	2008-12-19 08:16:04 +0000
@@ -66,7 +66,7 @@
 #define ACTION_PROFILE_CHARGE_ACCURACY_TEXT	_("Charge time accuracy profile")
 #define ACTION_PROFILE_DISCHARGE_ACCURACY_TEXT	_("Discharge time accuracy profile")
 
-#define GPM_STATISTICS_POLL_INTERVAL	15000 /* ms */
+#define GPM_STATISTICS_POLL_INTERVAL	15 /* s */
 
 struct GpmStatisticsPrivate
 {
@@ -862,7 +862,7 @@
 	gpm_statistics_refresh_axis_labels (statistics);
 
 	gtk_widget_show (main_window);
-	g_timeout_add (GPM_STATISTICS_POLL_INTERVAL,
+	g_timeout_add_seconds (GPM_STATISTICS_POLL_INTERVAL,
 		       gpm_statistics_graph_refresh, statistics);
 }
 

