Index: ChangeLog
===================================================================
--- ChangeLog	(revision 1026)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+2008-12-14  Debarshi Ray  <rishi@gnu.org>
+
+	Fix http://bugzilla.gnome.org/show_bug.cgi?id=564405 - Use
+	g_timeout_add_seconds where possible
+	
 2008-09-23  Vincent Untz  <vuntz@gnome.org>
 
 	* Makefile.am: remove old intltool cruft
Index: lib/sources/filessource.py
===================================================================
--- lib/sources/filessource.py	(revision 1026)
+++ lib/sources/filessource.py	(working copy)
@@ -177,7 +177,7 @@
     def should_not_be_reached ():
         assert False
         return True
-    timeout = gobject.timeout_add (60 * 1000, should_not_be_reached)
+    timeout = gobject.timeout_add_seconds (60, should_not_be_reached)
 
     profile_path = os.path.join (os.getcwd (), "file-test.zip")
     if os.path.exists (profile_path):
Index: lib/protosession.py
===================================================================
--- lib/protosession.py	(revision 1026)
+++ lib/protosession.py	(working copy)
@@ -385,8 +385,8 @@
         io_watch = gobject.io_add_watch (self.usr1_pipe_r,
                                          gobject.IO_IN | gobject.IO_PRI,
                                          self.__usr1_pipe_watch_handler)
-        timeout = gobject.timeout_add (XNEST_USR1_TIMEOUT * 1000,
-                                       self.__usr1_timeout_handler)
+        timeout = gobject.timeout_add_seconds (XNEST_USR1_TIMEOUT,
+                                               self.__usr1_timeout_handler)
 
         dprint ("Waiting on child process (%d)" % self.xnest_pid)
 
Index: lib/dirmonitor.py
===================================================================
--- lib/dirmonitor.py	(revision 1026)
+++ lib/dirmonitor.py	(working copy)
@@ -192,7 +192,7 @@
             print ("Expected event: %s %s") % (path, event_to_string (event))
         assert False
         return True
-    timeout = gobject.timeout_add (5 * 1000, should_not_be_reached, expected)
+    timeout = gobject.timeout_add_seconds (5, should_not_be_reached, expected)
 
     monitor = DirectoryMonitor (temp_path, handle_change, (expected, main_loop))
     monitor.set_directories_to_ignore (["bar"])
