Use g_timeout_add_seconds for some long timeouts

https://bugzilla.gnome.org/show_bug.cgi?id=692618

diff --git a/gio/tests/gdbus-tests.c b/gio/tests/gdbus-tests.c
index 20ec171..77d6235 100644 (file)
--- a/gio/tests/gdbus-tests.c
+++ b/gio/tests/gdbus-tests.c
@@ -68,9 +68,9 @@ _g_assert_property_notify_run (gpointer     object,
                                  G_CALLBACK (on_property_notify),
                                  &data);
   g_free (s);
-  timeout_id = g_timeout_add (30 * 1000,
-                              on_property_notify_timeout,
-                              &data);
+  timeout_id = g_timeout_add_seconds (30,
+                                      on_property_notify_timeout,
+                                      &data);
   g_main_loop_run (data.loop);
   g_signal_handler_disconnect (object, handler_id);
   g_source_remove (timeout_id);
@@ -117,9 +117,9 @@ _g_assert_signal_received_run (gpointer     object,
                                          signal_name,
                                          G_CALLBACK (on_signal_received),
                                          &data);
-  timeout_id = g_timeout_add (30 * 1000,
-                              on_signal_received_timeout,
-                              &data);
+  timeout_id = g_timeout_add_seconds (30,
+                                      on_signal_received_timeout,
+                                      &data);
   g_main_loop_run (data.loop);
   g_signal_handler_disconnect (object, handler_id);
   g_source_remove (timeout_id);

diff --git a/tests/child-test.c b/tests/child-test.c
index 9ebc202..ec36b24 100644 (file)
--- a/tests/child-test.c
+++ b/tests/child-test.c
@@ -176,7 +176,7 @@ main (int argc, char *argv[])
 #endif
 
   alive = 2;
-  g_timeout_add (30000, quit_loop, main_loop);
+  g_timeout_add_seconds (30, quit_loop, main_loop);
 
 #ifdef TEST_THREAD
   g_thread_create (test_thread, GINT_TO_POINTER (10), FALSE, NULL);