Commit b6befe4a authored by Alexandre Franke's avatar Alexandre Franke
Browse files

Switch from g_timeout_add to g_timeout_add_seconds

https://bugzilla.gnome.org/show_bug.cgi?id=712244
parent 7672bef4
......@@ -34,7 +34,7 @@
#define PROGRESS_DELAY 250 /* milliseconds */
#define TRANSIENT_DELAY 250 /* milliseconds */
#define POP_MESSAGE_DELAY 999 /* milliseconds */
#define POP_MESSAGE_DELAY 1 /* seconds */
typedef struct _StatusNode StatusNode;
......@@ -339,7 +339,7 @@ camel_operation_pop_message (GCancellable *cancellable)
if (node->source_id != 0)
g_source_remove (node->source_id);
node->source_id = g_timeout_add_full (
node->source_id = g_timeout_add_seconds_full (
G_PRIORITY_DEFAULT, POP_MESSAGE_DELAY,
operation_emit_status_cb,
status_node_ref (node),
......
......@@ -195,7 +195,7 @@ create_book (const gchar *book_id)
g_object_unref (scratch);
if (data.book == NULL) {
g_timeout_add (20 * 1000, create_source_timeout, NULL);
g_timeout_add_seconds (20, create_source_timeout, NULL);
g_main_loop_run (data.loop);
/* By now we aborted or we have an addressbook created */
......
......@@ -156,7 +156,7 @@ cursor_load_data (const gchar *vcard_path,
g_object_unref (scratch);
if (address_book == NULL) {
g_timeout_add (20 * 1000, cursor_data_source_timeout, NULL);
g_timeout_add_seconds (20, cursor_data_source_timeout, NULL);
g_main_loop_run (loop);
/* By now we aborted or we have an addressbook created */
......
......@@ -68,7 +68,7 @@ test_refresh_async (ETestServerFixture *fixture,
return;
e_client_refresh (E_CLIENT (book_client), NULL, async_refresh_result_ready, fixture->loop);
g_timeout_add (5 * 1000, (GSourceFunc) main_loop_fail_timeout, NULL);
g_timeout_add_seconds (5, (GSourceFunc) main_loop_fail_timeout, NULL);
g_main_loop_run (fixture->loop);
}
......
......@@ -134,7 +134,7 @@ test_get_book_view_async (ETestServerFixture *fixture,
book, query,
(GSourceFunc) get_book_view_cb, fixture->loop);
g_timeout_add (5 * 1000, (GSourceFunc) main_loop_fail_timeout, NULL);
g_timeout_add_seconds (5, (GSourceFunc) main_loop_fail_timeout, NULL);
g_main_loop_run (fixture->loop);
e_book_query_unref (query);
}
......
......@@ -88,7 +88,7 @@ test_get_supported_auth_methods_async (ETestServerFixture *fixture,
gconstpointer user_data)
{
g_idle_add ((GSourceFunc) get_supported_auth_methods_async_in_idle, fixture);
g_timeout_add (5 * 1000, (GSourceFunc) main_loop_fail_timeout, NULL);
g_timeout_add_seconds (5, (GSourceFunc) main_loop_fail_timeout, NULL);
g_main_loop_run (fixture->loop);
}
......
......@@ -379,7 +379,7 @@ e_test_server_utils_bootstrap_idle (FixturePair *pair)
if (pair->closure->type != E_TEST_SERVER_NONE)
pair->fixture->timeout_source_id =
g_timeout_add (20 * 1000, (GSourceFunc) e_test_server_utils_bootstrap_timeout, pair);
g_timeout_add_seconds (20, (GSourceFunc) e_test_server_utils_bootstrap_timeout, pair);
else
g_main_loop_quit (pair->fixture->loop);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment