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

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);
 
 }