From 6e72a236dcb592a942881e118d6a71888ea1581b Mon Sep 17 00:00:00 2001 From: Marcel Stimberg Date: Mon, 4 May 2009 10:10:55 +0530 Subject: ** BUGFIX: 573830 - g_timeout_add_seconds should be preferred to g_timeout_add According to https://wiki.ubuntu.com/SavingTheWorld (and of course according to the gtk docs) using g_timeout_add_seconds is preferred over g_timeout_add if a timeout in seconds is desired. --- mail/em-folder-tree.c | 2 +- mail/mail-folder-cache.c | 4 ++-- mail/mail-send-recv.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'mail') diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index eebb15454c..e7063e9fed 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -2641,5 +2641,5 @@ emft_queue_save_state (EMFolderTree *emft) if (priv->save_state_id != 0) return; - priv->save_state_id = g_timeout_add (1000, (GSourceFunc) emft_save_state, emft); + priv->save_state_id = g_timeout_add_seconds (1, (GSourceFunc) emft_save_state, emft); } diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 165f5941c2..a1589cec79 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -936,8 +936,8 @@ mail_note_store(CamelStore *store, CamelOperation *op, count_sent = getenv("EVOLUTION_COUNT_SENT") != NULL; count_trash = getenv("EVOLUTION_COUNT_TRASH") != NULL; buf = getenv ("EVOLUTION_PING_TIMEOUT"); - timeout = buf ? strtoul (buf, NULL, 10) * 1000 : 600000; - ping_id = g_timeout_add (timeout, ping_cb, NULL); + timeout = buf ? strtoul (buf, NULL, 10) : 600; + ping_id = g_timeout_add_seconds (timeout, ping_cb, NULL); } si = g_hash_table_lookup(stores, store); diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index d957a7d216..0b81fca5ed 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -1027,7 +1027,7 @@ auto_account_commit(struct _auto_data *info) } info->period = period; if (check && info->timeout_id == 0) - info->timeout_id = g_timeout_add(info->period*1000, auto_timeout, info); + info->timeout_id = g_timeout_add_seconds(info->period, auto_timeout, info); } static void -- cgit v1.2.3