Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

weather-service: Properly disconnect from GWeatherInfo

Browse Source 
We fail to disconnect from the GWeatherInfo in both update_location()
and dispose. We have to fix update_location() manually. To avoid the
need to disconnect in dispose, we can just use g_signal_connect_object().
This commit is contained in:
Michael Catanzaro
2019-07-09 21:26:22 -03:00
committed by Georges Basile Stavracas Neto
parent 8a98c697c4
commit 04053dbf47
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/weather/gcal-weather-service.c
+6 -2
View File
@@ -476,7 +476,11 @@ update_location (GcalWeatherService *self,
if (gcal_timer_is_running (self->duration_timer)) if (gcal_timer_is_running (self->duration_timer))
stop_timer (self); stop_timer (self);
g_clear_object (&self->gweather_info); if (self->gweather_info != NULL)
{
g_signal_handlers_disconnect_by_data (self->gweather_info, self);
g_clear_object (&self->gweather_info);
}
if (!location) if (!location)
{ {
@@ -496,7 +500,7 @@ update_location (GcalWeatherService *self,
* what is going on. * what is going on.
*/ */
gweather_info_set_enabled_providers (self->gweather_info, GWEATHER_PROVIDER_METAR | GWEATHER_PROVIDER_OWM | GWEATHER_PROVIDER_YR_NO); 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); g_signal_connect_object (self->gweather_info, "updated", (GCallback) on_gweather_update_cb, self, 0);
/* /*
* gweather_info_update might or might not trigger a * gweather_info_update might or might not trigger a