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 /plugins | |
| parent | 5395bd3308e25f3ca2ac1b35460ba6df1d294f4b (diff) | |
| parent | fb970ccf14e33d92cfb9409d44f7b06355e958fc (diff) | |
| download | gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.gz gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.bz2 gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.lz gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.xz 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 'plugins')
| -rw-r--r-- | plugins/bbdb/bbdb.c | 2 | ||||
| -rw-r--r-- | plugins/bbdb/bbdb.h | 2 | ||||
| -rw-r--r-- | plugins/publish-calendar/publish-calendar.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 547a779961..adc89dbcb2 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -115,7 +115,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable) if (bbdb_check_gaim_enabled ()) bbdb_sync_buddy_list_check (); - g_timeout_add (BBDB_BLIST_CHECK_INTERVAL, + g_timeout_add_seconds (BBDB_BLIST_CHECK_INTERVAL, (GSourceFunc) bbdb_timeout, NULL); } diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index e36a7737c3..55c88709b0 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -33,7 +33,7 @@ /* How often to poll the buddy list for changes (every two minutes) */ -#define BBDB_BLIST_CHECK_INTERVAL (2 * 60 * 1000) +#define BBDB_BLIST_CHECK_INTERVAL (2 * 60) /* bbdb.c */ EBook *bbdb_open_addressbook (int type); diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 4adbe0d726..a901317dfb 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -352,11 +352,11 @@ add_timeout (EPublishUri *uri) /* Set the timeout for now+frequency */ switch (uri->publish_frequency) { case URI_PUBLISH_DAILY: - id = g_timeout_add (24 * 60 * 60 * 1000, (GSourceFunc) publish_no_succ_info, uri); + id = g_timeout_add_seconds (24 * 60 * 60, (GSourceFunc) publish, uri); g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id)); break; case URI_PUBLISH_WEEKLY: - id = g_timeout_add (7 * 24 * 60 * 60 * 1000, (GSourceFunc) publish_no_succ_info, uri); + id = g_timeout_add_seconds (7 * 24 * 60 * 60, (GSourceFunc) publish, uri); g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id)); break; } @@ -419,7 +419,7 @@ add_offset_timeout (EPublishUri *uri) publish (uri, FALSE); add_timeout (uri); } else { - id = g_timeout_add (((24 * 60 * 60) - elapsed) * 1000, (GSourceFunc) publish_no_succ_info, uri); + id = g_timeout_add_seconds (24 * 60 * 60 - elapsed, (GSourceFunc) publish, uri); g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id)); break; } @@ -429,7 +429,7 @@ add_offset_timeout (EPublishUri *uri) publish (uri, FALSE); add_timeout (uri); } else { - id = g_timeout_add (((7 * 24 * 60 * 60) - elapsed) * 1000, (GSourceFunc) publish_no_succ_info, uri); + id = g_timeout_add_seconds (7 * 24 * 60 * 60 - elapsed, (GSourceFunc) publish, uri); g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id)); break; } |