aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/alarm-notify
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-10-30 02:04:54 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-10-30 03:22:35 +0800
commitbc0d5d40ed39c92dcdf62ae891a2e99c25237d74 (patch)
treea07763eeaa20602bd4c0620b2fe67c443c52d29c /calendar/alarm-notify
parentd3e0f96c73dde49acde92f6347b9e362d85e94aa (diff)
downloadgsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.tar
gsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.tar.gz
gsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.tar.bz2
gsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.tar.lz
gsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.tar.xz
gsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.tar.zst
gsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.zip
Bug 710797 - Name all the timeouts added with g_timeout_add()
Diffstat (limited to 'calendar/alarm-notify')
-rw-r--r--calendar/alarm-notify/alarm-queue.c15
-rw-r--r--calendar/alarm-notify/alarm.c3
2 files changed, 10 insertions, 8 deletions
diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c
index d4c335f66f..0c3cf71212 100644
--- a/calendar/alarm-notify/alarm-queue.c
+++ b/calendar/alarm-notify/alarm-queue.c
@@ -1774,7 +1774,8 @@ display_notification (time_t trigger,
} else {
if (tray_blink_id == -1) {
tray_blink_countdown = 30;
- tray_blink_id = g_timeout_add (500, tray_icon_blink_cb, tray_data);
+ tray_blink_id = e_named_timeout_add (
+ 500, tray_icon_blink_cb, tray_data);
}
}
}
@@ -2134,12 +2135,14 @@ alarm_queue_init (gpointer data)
config_data_set_last_notification_time (NULL, tmval);
}
- /* install timeout handler (every 30 mins) for not missing the midnight refresh */
- g_timeout_add_seconds (1800, check_midnight_refresh, NULL);
+ /* Install timeout handler (every 30 mins) for not missing the
+ * midnight refresh. */
+ e_named_timeout_add_seconds (1800, check_midnight_refresh, NULL);
- /* monotonic time doesn't change during hibernation, while the wall clock time does,
- * thus check for wall clock time changes and reschedule alarms when it changes */
- g_timeout_add_seconds (60, check_wall_clock_time_changed, NULL);
+ /* Monotonic time doesn't change during hibernation, while the
+ * wall clock time does, thus check for wall clock time changes
+ * and reschedule alarms when it changes. */
+ e_named_timeout_add_seconds (60, check_wall_clock_time_changed, NULL);
#ifdef HAVE_LIBNOTIFY
notify_init (_("Evolution Reminders"));
diff --git a/calendar/alarm-notify/alarm.c b/calendar/alarm-notify/alarm.c
index 1c4f01a150..77aae15b7f 100644
--- a/calendar/alarm-notify/alarm.c
+++ b/calendar/alarm-notify/alarm.c
@@ -157,8 +157,7 @@ setup_timeout (void)
diff / 60, diff % 60, (gint64) ar->trigger, (gint64) now));
debug ((" %s", ctime (&ar->trigger)));
debug ((" %s", ctime (&now)));
- timeout_id = g_timeout_add_seconds (diff, alarm_ready_cb, NULL);
-
+ timeout_id = e_named_timeout_add_seconds (diff, alarm_ready_cb, NULL);
}
/* Used from g_list_insert_sorted(); compares the