[gnome-calendar] views: more weather service cleanups
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar] views: more weather service cleanups
- Date: Sun, 17 Dec 2017 00:37:43 +0000 (UTC)
commit dcf4ff0bda0ba692913e509beebd725ca28df600
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Sat Dec 16 22:25:44 2017 -0200
views: more weather service cleanups
Did I ever say how happy I'll be when people start
actually following my code style when densing code
to my projects?
src/gcal-weather-service.c | 130 +++++++++++++++++++++++---------------------
src/views/gcal-month-view.c | 32 +----------
src/views/gcal-view.c | 13 ++---
src/views/gcal-year-view.c | 35 +-----------
4 files changed, 76 insertions(+), 134 deletions(-)
---
diff --git a/src/gcal-weather-service.c b/src/gcal-weather-service.c
index 0df55c32..e2e31250 100644
--- a/src/gcal-weather-service.c
+++ b/src/gcal-weather-service.c
@@ -214,8 +214,6 @@ schedule_midnight (GcalWeatherService *self)
gint64 real_now;
gint64 real_mid;
- g_return_if_fail (GCAL_IS_WEATHER_SERVICE (self));
-
zone = !self->timezone ? g_time_zone_new_local () : g_time_zone_ref (self->timezone);
now = g_date_time_new_now (zone);
@@ -379,6 +377,7 @@ get_time_day_start (GcalWeatherService *self,
*ret_unix = g_date_time_to_unix (day);
*ret_unix_exact = g_date_time_to_unix (now);
+
return TRUE;
}
@@ -495,15 +494,12 @@ static void
update_location (GcalWeatherService *self,
GWeatherLocation *location)
{
- g_return_if_fail (GCAL_IS_WEATHER_SERVICE (self));
-
if (gcal_timer_is_running (self->duration_timer))
stop_timer (self);
- if (self->gweather_info != NULL)
- g_clear_object (&self->gweather_info);
+ g_clear_object (&self->gweather_info);
- if (location == NULL)
+ if (!location)
{
g_debug ("Could not retrieve current location");
update_weather (self, NULL, FALSE);
@@ -511,18 +507,20 @@ update_location (GcalWeatherService *self,
else
{
g_debug ("Got new weather service location: '%s'",
- (location == NULL)? "<null>" : gweather_location_get_name (location));
+ !location ? "<null>" : gweather_location_get_name (location));
self->gweather_info = gweather_info_new (location);
- /* NOTE: We do not get detailed infos for GWEATHER_PROVIDER_ALL.
+ /*
+ * NOTE: We do not get detailed infos for GWEATHER_PROVIDER_ALL.
* This combination works fine, though. We should open a bug / investigate
* what is going on.
*/
gweather_info_set_enabled_providers (self->gweather_info, GWEATHER_PROVIDER_METAR |
GWEATHER_PROVIDER_OWM | GWEATHER_PROVIDER_YR_NO);
g_signal_connect (self->gweather_info, "updated", (GCallback) on_gweather_update_cb, self);
- /* gweather_info_update might or might not trigger a
+ /*
+ * gweather_info_update might or might not trigger a
* GWeatherInfo::update() signal. Therefore, we have to
* remove weather information before querying new one.
* This might result in icon flickering on screen.
@@ -714,11 +712,12 @@ on_gclue_simple_creation_cb (GClueSimple *_source,
GcalWeatherService *self)
{
g_autoptr (GError) error = NULL;
- GClueLocation *location; /* unowned */
- GClueSimple *location_service; /* owned */
- GClueClient *client; /* unowned */
+ GClueLocation *location;
+ GClueSimple *location_service;
+ GClueClient *client;
- /* make sure we do not touch self->location_service
+ /*
+ * Make sure we do not touch self->location_service
* if the current operation was cancelled.
*/
location_service = gclue_simple_new_finish (result, &error);
@@ -773,13 +772,13 @@ on_gclue_client_stop (GClueClient *client,
GAsyncResult *res,
GClueSimple *simple)
{
- g_autoptr(GError) error = NULL; /* owned */
+ g_autoptr (GError) error = NULL;
gboolean stopped;
stopped = gclue_client_call_stop_finish (client,
res,
&error);
- if (error != NULL)
+ if (error)
g_warning ("Could not stop location service: %s", error->message);
else if (!stopped)
g_warning ("Could not stop location service");
@@ -830,11 +829,11 @@ static gchar*
gwc2str (GWeatherInfo *gwi)
{
g_autoptr (GDateTime) date = NULL;
- g_autofree gchar *date_str = NULL;
- glong update;
+ g_autofree gchar *date_str = NULL;
+ glong update;
- gchar *icon_name; /* unowned */
- gdouble temp;
+ gchar *icon_name; /* unowned */
+ gdouble temp;
if (!gweather_info_get_value_update (gwi, &update))
return g_strdup ("<null>");
@@ -856,8 +855,7 @@ static void
set_max_days (GcalWeatherService *self,
guint days)
{
- g_return_if_fail (GCAL_IS_WEATHER_SERVICE (self));
- g_return_if_fail (days >= 1);
+ g_assert_cmpint (days, >=, 1);
self->max_days = days;
@@ -868,8 +866,7 @@ static void
set_valid_timespan (GcalWeatherService *self,
gint64 timespan)
{
- g_return_if_fail (GCAL_IS_WEATHER_SERVICE (self));
- g_return_if_fail (timespan >= 0);
+ g_assert_cmpint (timespan, >=, 0);
self->valid_timespan = timespan;
@@ -881,8 +878,6 @@ has_valid_weather_infos (GcalWeatherService *self)
{
gint64 now;
- g_return_val_if_fail (GCAL_IS_WEATHER_SERVICE (self), FALSE);
-
if (self->gweather_info == NULL || self->weather_infos_upated < 0)
return FALSE;
@@ -906,10 +901,6 @@ update_weather (GcalWeatherService *self,
{
GSList *gwforecast = NULL; /* unowned */
- g_return_if_fail (GCAL_IS_WEATHER_SERVICE (self));
- g_return_if_fail (info == NULL || GWEATHER_IS_INFO (info));
-
-
/* Compute a list of newly received weather infos. */
if (!info)
{
@@ -1062,23 +1053,27 @@ gcal_weather_service_class_init (GcalWeatherServiceClass *klass)
*
* Maximal number of days to fetch forecasts for.
*/
- g_object_class_install_property
- (G_OBJECT_CLASS (klass),
- PROP_MAX_DAYS,
- g_param_spec_uint ("max-days", "max-days", "max-days",
- 1, G_MAXUINT, 3,
- G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (object_class,
+ PROP_MAX_DAYS,
+ g_param_spec_uint ("max-days",
+ "max-days",
+ "max-days",
+ 1,
+ G_MAXUINT,
+ 3,
+ G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
/**
* GcalWeatherService:time-zone:
*
* The time zone to use.
*/
- g_object_class_install_property
- (G_OBJECT_CLASS (klass),
- PROP_TIME_ZONE,
- g_param_spec_pointer ("time-zone", "time-zone", "time-zone",
- G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_TIME_ZONE,
+ g_param_spec_pointer ("time-zone",
+ "time-zone",
+ "time-zone",
+ G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE));
/**
* GcalWeatherService:check-interval-new:
@@ -1086,12 +1081,15 @@ gcal_weather_service_class_init (GcalWeatherServiceClass *klass)
* Amount of seconds to wait before re-fetching weather infos.
* This interval is used when no valid weather reports are available.
*/
- g_object_class_install_property
- (G_OBJECT_CLASS (klass),
- PROP_CHECK_INTERVAL_NEW,
- g_param_spec_uint ("check-interval-new", "check-interval-new", "check-interval-new",
- 0, G_MAXUINT, GCAL_WEATHER_CHECK_INTERVAL_NEW_DFLT,
- G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (object_class,
+ PROP_CHECK_INTERVAL_NEW,
+ g_param_spec_uint ("check-interval-new",
+ "check-interval-new",
+ "check-interval-new",
+ 0,
+ G_MAXUINT,
+ GCAL_WEATHER_CHECK_INTERVAL_NEW_DFLT,
+ G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
/**
* GcalWeatherService:check-interval-renew:
@@ -1099,24 +1097,30 @@ gcal_weather_service_class_init (GcalWeatherServiceClass *klass)
* Amount of seconds to wait before re-fetching weather information.
* This interval is used when valid weather reports are available.
*/
- g_object_class_install_property
- (G_OBJECT_CLASS (klass),
- PROP_CHECK_INTERVAL_RENEW,
- g_param_spec_uint ("check-interval-renew", "check-interval-renew", "check-interval-renew",
- 0, G_MAXUINT, GCAL_WEATHER_CHECK_INTERVAL_RENEW_DFLT,
- G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (object_class,
+ PROP_CHECK_INTERVAL_RENEW,
+ g_param_spec_uint ("check-interval-renew",
+ "check-interval-renew",
+ "check-interval-renew",
+ 0,
+ G_MAXUINT,
+ GCAL_WEATHER_CHECK_INTERVAL_RENEW_DFLT,
+ G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
/**
* GcalWeatherService:valid_timespan:
*
* Amount of seconds fetched weather information are considered as valid.
*/
- g_object_class_install_property
- (G_OBJECT_CLASS (klass),
- PROP_VALID_TIMESPAN,
- g_param_spec_int64 ("valid-timespan", "valid-timespan", "valid-timespan",
- 0, G_MAXINT64, GCAL_WEATHER_VALID_TIMESPAN_DFLT,
- G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (object_class,
+ PROP_VALID_TIMESPAN,
+ g_param_spec_int64 ("valid-timespan",
+ "valid-timespan",
+ "valid-timespan",
+ 0,
+ G_MAXINT64,
+ GCAL_WEATHER_VALID_TIMESPAN_DFLT,
+ G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
/**
@@ -1196,7 +1200,7 @@ gcal_weather_service_new (GTimeZone *time_zone,
GTimeZone*
gcal_weather_service_get_time_zone (GcalWeatherService *self)
{
- g_return_val_if_fail (self != NULL, NULL);
+ g_return_val_if_fail (GCAL_IS_WEATHER_SERVICE (self), NULL);
return self->timezone;
}
@@ -1212,7 +1216,7 @@ void
gcal_weather_service_set_time_zone (GcalWeatherService *self,
GTimeZone *value)
{
- g_return_if_fail (self != NULL);
+ g_return_if_fail (GCAL_IS_WEATHER_SERVICE (self));
if (self->timezone == value)
return;
@@ -1311,7 +1315,7 @@ gcal_weather_service_get_attribution (GcalWeatherService *self)
{
g_return_val_if_fail (GCAL_IS_WEATHER_SERVICE (self), NULL);
- if (self->gweather_info != NULL)
+ if (self->gweather_info)
return gweather_info_get_attribution (self->gweather_info);
return NULL;
@@ -1328,7 +1332,7 @@ gcal_weather_service_update (GcalWeatherService *self)
{
g_return_if_fail (GCAL_IS_WEATHER_SERVICE (self));
- if (self->gweather_info != NULL)
+ if (self->gweather_info)
{
gweather_info_update (self->gweather_info);
update_timeout_interval (self);
diff --git a/src/views/gcal-month-view.c b/src/views/gcal-month-view.c
index 9355b168..ee3b0610 100644
--- a/src/views/gcal-month-view.c
+++ b/src/views/gcal-month-view.c
@@ -1765,7 +1765,7 @@ gcal_month_view_set_property (GObject *object,
case PROP_WEATHER_SERVICE:
gcal_view_set_weather_service_impl_helper (&self->weather_service,
- GCAL_WEATHER_SERVICE (g_value_get_object (value)),
+ g_value_get_object (value),
(GcalWeatherUpdateFunc) update_weather,
(GCallback) weather_changed_cb,
GTK_WIDGET (self));
@@ -1805,37 +1805,13 @@ gcal_month_view_get_property (GObject *object,
}
}
-/*
- * Called when self is destroyed.
- *
- * WARNING: This is a workaround. This is one of the views where
- * reference counts are off. We overwrite destroy to avoid dangling
- * pointers. This issue needs to be addressed and this function removed.
- */
-static void
-gcal_month_view_destroyed (GtkWidget *widget)
-{
- GcalMonthView *self = GCAL_MONTH_VIEW (widget);
-
- if (self->weather_service)
- {
- g_signal_handlers_disconnect_by_func (self->weather_service, weather_changed_cb, self);
- g_clear_object (&self->weather_service);
- }
-
- GTK_WIDGET_CLASS (gcal_month_view_parent_class)->destroy (widget);
-}
-
static void
gcal_month_view_finalize (GObject *object)
{
GcalMonthView *self = GCAL_MONTH_VIEW (object);
if (self->weather_service)
- {
- g_signal_handlers_disconnect_by_func (self->weather_service, weather_changed_cb, self);
- g_clear_object (&self->weather_service);
- }
+ g_signal_handlers_disconnect_by_func (self->weather_service, weather_changed_cb, self);
g_clear_pointer (&self->date, g_free);
g_clear_pointer (&self->children, g_hash_table_destroy);
@@ -1844,6 +1820,7 @@ gcal_month_view_finalize (GObject *object)
g_clear_pointer (&self->multi_cell_children, g_list_free);
g_clear_object (&self->manager);
+ g_clear_object (&self->weather_service);
if (self->update_grid_id > 0)
{
@@ -2195,9 +2172,6 @@ gcal_month_view_class_init (GcalMonthViewClass *klass)
widget_class->key_press_event = gcal_month_view_key_press;
widget_class->scroll_event = gcal_month_view_scroll_event;
- /* FIXME: Hack to deal with broken reference counts */
- widget_class->destroy = gcal_month_view_destroyed;
-
container_class = GTK_CONTAINER_CLASS (klass);
container_class->add = gcal_month_view_add;
container_class->remove = gcal_month_view_remove;
diff --git a/src/views/gcal-view.c b/src/views/gcal-view.c
index 581cec9d..0cdf0400 100644
--- a/src/views/gcal-view.c
+++ b/src/views/gcal-view.c
@@ -214,18 +214,13 @@ gcal_view_set_weather_service_impl_helper (GcalWeatherService **old_service,
if (*old_service != new_service)
{
- if (*old_service != NULL)
- g_signal_handlers_disconnect_by_func (*old_service,
- (GCallback) weather_changed_cb,
- data);
+ if (*old_service)
+ g_signal_handlers_disconnect_by_func (*old_service, weather_changed_cb, data);
g_set_object (old_service, new_service);
- if (*old_service != NULL)
- g_signal_connect (*old_service,
- "weather-changed",
- (GCallback) weather_changed_cb,
- data);
+ if (*old_service)
+ g_signal_connect (*old_service, "weather-changed", weather_changed_cb, data);
update_func (data);
g_object_notify (G_OBJECT (data), "weather-service");
diff --git a/src/views/gcal-year-view.c b/src/views/gcal-year-view.c
index 51483ab8..3d2fe2d6 100644
--- a/src/views/gcal-year-view.c
+++ b/src/views/gcal-year-view.c
@@ -1598,41 +1598,12 @@ gcal_view_interface_init (GcalViewInterface *iface)
iface->get_children_by_uuid = gcal_year_view_get_children_by_uuid;
}
-/* Called when self is destroyed.
- *
- * WARNING: This is a workaround. This is one of the views where
- * reference counts are off. We overwrite destroy to avoid dangling
- * pointers. This issue needs to be addressed and this function removed.
- */
-static void
-gcal_year_view_destroyed (GtkWidget *widget)
-{
- GcalYearView *self = GCAL_YEAR_VIEW (widget);
-
- if (self->weather_service)
- {
- g_signal_handlers_disconnect_by_func (self->weather_service, weather_changed, self);
- g_clear_object (&self->weather_service);
- }
-
- GTK_WIDGET_CLASS (gcal_year_view_parent_class)->destroy (widget);
-}
-
static void
gcal_year_view_finalize (GObject *object)
{
GcalYearView *year_view = GCAL_YEAR_VIEW (object);
guint i;
- if (year_view->weather_service != NULL)
- {
- g_signal_connect (year_view->weather_service,
- "weather-changed",
- (GCallback) weather_changed,
- year_view);
- g_clear_object (&year_view->weather_service);
- }
-
g_free (year_view->navigator_grid);
g_free (year_view->selected_data);
@@ -1642,6 +1613,7 @@ gcal_year_view_finalize (GObject *object)
g_clear_pointer (&year_view->date, g_free);
g_clear_object (&year_view->calendar_settings);
+ g_clear_object (&year_view->weather_service);
for (i = 0; i < 12; i++)
g_clear_pointer (&year_view->events[i], g_ptr_array_unref);
@@ -1707,7 +1679,7 @@ gcal_year_view_set_property (GObject *object,
case PROP_WEATHER_SERVICE:
gcal_view_set_weather_service_impl_helper (&self->weather_service,
- GCAL_WEATHER_SERVICE (g_value_get_object (value)),
+ g_value_get_object (value),
(GcalWeatherUpdateFunc) update_weather,
(GCallback) weather_changed,
GTK_WIDGET (self));
@@ -1986,9 +1958,6 @@ gcal_year_view_class_init (GcalYearViewClass *klass)
widget_class->size_allocate = gcal_year_view_size_allocate;
widget_class->direction_changed = gcal_year_view_direction_changed;
- /* Hack to deal with broken reference counts */
- widget_class->destroy = gcal_year_view_destroyed;
-
g_object_class_override_property (object_class, PROP_DATE, "active-date");
g_object_class_override_property (object_class, PROP_MANAGER, "manager");
g_object_class_override_property (object_class, PROP_WEATHER_SERVICE, "weather-service");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
