From 50e675da05e9a74431ee92d762bcf2fd18cea38f Mon Sep 17 00:00:00 2001 From: Florian Brosch Date: Mon, 23 Oct 2017 22:39:27 +0200 Subject: [PATCH] timer: Improve duration api - rename duration setter - add duration getter --- src/gcal-timer.c | 19 +++++++++++++++++-- src/gcal-timer.h | 4 +++- src/gcal-weather-service.c | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/gcal-timer.c b/src/gcal-timer.c index 7baa0245..0f8ace1c 100644 --- a/src/gcal-timer.c +++ b/src/gcal-timer.c @@ -262,8 +262,8 @@ gcal_timer_is_running (GcalTimer *self) * Changes the duration between two events. */ void -gcal_timer_set_duration (GcalTimer *self, - gint64 duration) +gcal_timer_set_default_duration (GcalTimer *self, + gint64 duration) { gint64 now; @@ -283,6 +283,21 @@ gcal_timer_set_duration (GcalTimer *self, +/** + * gcal_timer_get_default_duration: + * @self: The #GcalTimer. + * + * Returns the default duration. + */ +gint64 +gcal_timer_get_default_duration (GcalTimer *self) +{ + g_return_val_if_fail (self != NULL, -1); + + return self->default_duration; +} + + /** * gcal_timer_set_callback: * @self: The #GcalTimer. diff --git a/src/gcal-timer.h b/src/gcal-timer.h index 3f7666ba..322d616f 100644 --- a/src/gcal-timer.h +++ b/src/gcal-timer.h @@ -38,9 +38,11 @@ void gcal_timer_stop (GcalTimer *self); gboolean gcal_timer_is_running (GcalTimer *self); -void gcal_timer_set_duration (GcalTimer *self, +void gcal_timer_set_default_duration (GcalTimer *self, gint64 duration); +gint64 gcal_timer_get_default_duration (GcalTimer *self); + void gcal_timer_set_callback (GcalTimer *self, GCalTimerFunc func, gpointer data, diff --git a/src/gcal-weather-service.c b/src/gcal-weather-service.c index 04a834e4..80ffbf08 100644 --- a/src/gcal-weather-service.c +++ b/src/gcal-weather-service.c @@ -1235,7 +1235,7 @@ static void update_timeout_interval (GcalWeatherService *self) { g_return_if_fail (GCAL_IS_WEATHER_SERVICE (self)); - gcal_timer_set_duration (self->timer, self->check_interval_renew); + gcal_timer_set_default_duration (self->timer, self->check_interval_renew); }