diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-04 21:08:32 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-04 21:08:32 +0800 |
| commit | c3e0648d8b5a1d73f82f0a7691b9ab1320248392 (patch) | |
| tree | 677c9472380b3119d08f42eb48c001d18bfd6243 /mail/mail-folder-cache.c | |
| parent | 5395bd3308e25f3ca2ac1b35460ba6df1d294f4b (diff) | |
| parent | fb970ccf14e33d92cfb9409d44f7b06355e958fc (diff) | |
| download | gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.gz gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.zst gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.zip | |
Merge branch 'master' into kill-bonobo
Conflicts:
addressbook/gui/Makefile.am
addressbook/gui/widgets/Makefile.am
addressbook/gui/widgets/eab-popup-control.c
calendar/gui/e-meeting-time-sel.c
calendar/gui/migration.c
calendar/modules/e-memo-shell-module-migrate.h
e-util/e-logger.c
mail/e-mail-attachment-bar.c
mail/em-composer-utils.c
mail/em-format-html-display.c
plugins/mail-account-disable/Makefile.am
plugins/select-one-source/Makefile.am
po/es.po
shell/Makefile.am
shell/e-shell-common.h
shell/e-shell-nm.c
shell/e-shell-window-commands.c
shell/e-shell-window.c
shell/e-sidebar.c
shell/e-user-creatable-items-handler.c
shell/importer/Makefile.am
shell/test/Makefile.am
widgets/misc/test-error.c
widgets/misc/test-info-label.c
widgets/misc/test-multi-config-dialog.c
Diffstat (limited to 'mail/mail-folder-cache.c')
| -rw-r--r-- | mail/mail-folder-cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 46a62e4fc2..f4e07f289c 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -982,8 +982,8 @@ mail_note_store(EShellModule *shell_module, CamelStore *store, CamelOperation *o 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); |