aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/alarm-notify
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-05-04 21:08:32 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-05-04 21:08:32 +0800
commitc3e0648d8b5a1d73f82f0a7691b9ab1320248392 (patch)
tree677c9472380b3119d08f42eb48c001d18bfd6243 /calendar/gui/alarm-notify
parent5395bd3308e25f3ca2ac1b35460ba6df1d294f4b (diff)
parentfb970ccf14e33d92cfb9409d44f7b06355e958fc (diff)
downloadgsoc2013-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 'calendar/gui/alarm-notify')
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c2
-rw-r--r--calendar/gui/alarm-notify/alarm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 0328743a77..d30f2550f0 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -1866,7 +1866,7 @@ alarm_queue_init (gpointer data)
}
/* install timeout handler (every 30 mins) for not missing the midnight refresh */
- g_timeout_add (1800000, (GSourceFunc) check_midnight_refresh, NULL);
+ g_timeout_add_seconds (1800, (GSourceFunc) check_midnight_refresh, NULL);
#ifdef HAVE_LIBNOTIFY
notify_init("Evolution Alarms");
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index bf96f1f664..5dca49ae25 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -153,7 +153,7 @@ setup_timeout (void)
g_message ("Setting timeout for %d %lu %lu", diff, ar->trigger, now);
g_message (" %s", ctime (&ar->trigger));
g_message (" %s", ctime (&now));
- timeout_id = g_timeout_add (diff * 1000, alarm_ready_cb, NULL);
+ timeout_id = g_timeout_add_seconds (diff, alarm_ready_cb, NULL);
}