Index: browser-plugin/test-glow-button.c
===================================================================
--- browser-plugin/test-glow-button.c	(revision 5853)
+++ browser-plugin/test-glow-button.c	(working copy)
@@ -44,8 +44,8 @@
 
 	totem_glow_button_set_glow (TOTEM_GLOW_BUTTON (button), TRUE);
 
-//	g_timeout_add (1000, idle_cb, button);
-	g_timeout_add (5000, idle_un_cb, button);
+//	g_timeout_add_seconds (1, idle_cb, button);
+	g_timeout_add_seconds (5, idle_un_cb, button);
 
 	gtk_widget_show_all (window);
 
Index: src/plugins/totem-plugins-engine.c
===================================================================
--- src/plugins/totem-plugins-engine.c	(revision 5853)
+++ src/plugins/totem-plugins-engine.c	(working copy)
@@ -375,7 +375,9 @@
 
 	totem_plugins_engine_load_all ();
 
-	garbage_collect_id = g_timeout_add_full (G_PRIORITY_LOW, 20000, garbage_collect_cb, NULL, NULL);
+#ifdef ENABLE_PYTHON
+	garbage_collect_id = g_timeout_add_seconds_full (G_PRIORITY_LOW, 20, garbage_collect_cb, NULL, NULL);
+#endif
 
 	return TRUE;
 }
@@ -432,9 +434,11 @@
 		g_object_unref (totem_plugins_object);
 	totem_plugins_object = NULL;
 
+#ifdef ENABLE_PYTHON
 	if (garbage_collect_id > 0)
 		g_source_remove (garbage_collect_id);
 	totem_plugins_engine_garbage_collect ();
+#endif
 
 	if (client != NULL)
 		g_object_unref (client);
Index: src/plugins/totem-python-module.c
===================================================================
--- src/plugins/totem-python-module.c	(revision 5853)
+++ src/plugins/totem-python-module.c	(working copy)
@@ -541,7 +541,7 @@
 			/* loop */;
 
 		/* This helps to force Python to give up its shell reference */
-		g_timeout_add (1000, finalise_collect_cb, NULL);
+		g_idle_add (finalise_collect_cb, NULL);
 
 		/* Disable for now, due to bug 334188
 		Py_Finalize ();*/
Index: src/plugins/gromit/totem-gromit.c
===================================================================
--- src/plugins/gromit/totem-gromit.c	(revision 5853)
+++ src/plugins/gromit/totem-gromit.c	(working copy)
@@ -69,7 +69,7 @@
 	TotemPluginClass parent_class;
 } TotemGromitPluginClass;
 
-#define INTERVAL 10000
+#define INTERVAL 10 /* seconds */
 
 static const char *start_cmd[] =	{ NULL, "-a", "-k", "none", NULL };
 static const char *toggle_cmd[] =	{ NULL, "-t", NULL };
@@ -238,7 +238,7 @@
 
 	launch (visibility_cmd);
 	launch (clear_cmd);
-	plugin->id = g_timeout_add (INTERVAL, totem_gromit_timeout_cb, plugin);
+	plugin->id = g_timeout_add_seconds (INTERVAL, totem_gromit_timeout_cb, plugin);
 }
 
 static gboolean
Index: src/test-properties-page.c
===================================================================
--- src/test-properties-page.c	(revision 5853)
+++ src/test-properties-page.c	(working copy)
@@ -92,7 +92,7 @@
 #else
 		create_props (argv[1]);
 #endif
-		g_timeout_add (4000, main_loop_exit, NULL);
+		g_timeout_add_seconds (4, main_loop_exit, NULL);
 		gtk_main ();
 #if 1
 		destroy_props ();
