|
Milan Crha |
37c245 |
diff -up evolution-data-server-3.10.4/calendar/backends/weather/e-cal-backend-weather.c.weather-calendar-crash evolution-data-server-3.10.4/calendar/backends/weather/e-cal-backend-weather.c
|
|
Milan Crha |
37c245 |
--- evolution-data-server-3.10.4/calendar/backends/weather/e-cal-backend-weather.c.weather-calendar-crash 2013-12-08 19:43:28.000000000 +0100
|
|
Milan Crha |
37c245 |
+++ evolution-data-server-3.10.4/calendar/backends/weather/e-cal-backend-weather.c 2014-02-20 08:46:00.858247045 +0100
|
|
Milan Crha |
37c245 |
@@ -737,19 +737,35 @@ e_cal_backend_weather_notify_online_cb (
|
|
Milan Crha |
37c245 |
e_cal_backend_set_writable (backend, FALSE);
|
|
Milan Crha |
37c245 |
}
|
|
Milan Crha |
37c245 |
|
|
Milan Crha |
37c245 |
-/* Finalize handler for the weather backend */
|
|
Milan Crha |
37c245 |
static void
|
|
Milan Crha |
37c245 |
-e_cal_backend_weather_finalize (GObject *object)
|
|
Milan Crha |
37c245 |
+e_cal_backend_weather_dispose (GObject *object)
|
|
Milan Crha |
37c245 |
{
|
|
Milan Crha |
37c245 |
ECalBackendWeatherPrivate *priv;
|
|
Milan Crha |
37c245 |
|
|
Milan Crha |
37c245 |
priv = E_CAL_BACKEND_WEATHER_GET_PRIVATE (object);
|
|
Milan Crha |
37c245 |
|
|
Milan Crha |
37c245 |
- if (priv->reload_timeout_id)
|
|
Milan Crha |
37c245 |
+ if (priv->reload_timeout_id) {
|
|
Milan Crha |
37c245 |
g_source_remove (priv->reload_timeout_id);
|
|
Milan Crha |
37c245 |
+ priv->reload_timeout_id = 0;
|
|
Milan Crha |
37c245 |
+ }
|
|
Milan Crha |
37c245 |
|
|
Milan Crha |
37c245 |
- if (priv->begin_retrival_id)
|
|
Milan Crha |
37c245 |
+ if (priv->begin_retrival_id) {
|
|
Milan Crha |
37c245 |
g_source_remove (priv->begin_retrival_id);
|
|
Milan Crha |
37c245 |
+ priv->begin_retrival_id = 0;
|
|
Milan Crha |
37c245 |
+ }
|
|
Milan Crha |
37c245 |
+
|
|
Milan Crha |
37c245 |
+ g_clear_object (&priv->source);
|
|
Milan Crha |
37c245 |
+
|
|
Milan Crha |
37c245 |
+ /* Chain up to parent's dispose() method. */
|
|
Milan Crha |
37c245 |
+ G_OBJECT_CLASS (e_cal_backend_weather_parent_class)->dispose (object);
|
|
Milan Crha |
37c245 |
+}
|
|
Milan Crha |
37c245 |
+
|
|
Milan Crha |
37c245 |
+static void
|
|
Milan Crha |
37c245 |
+e_cal_backend_weather_finalize (GObject *object)
|
|
Milan Crha |
37c245 |
+{
|
|
Milan Crha |
37c245 |
+ ECalBackendWeatherPrivate *priv;
|
|
Milan Crha |
37c245 |
+
|
|
Milan Crha |
37c245 |
+ priv = E_CAL_BACKEND_WEATHER_GET_PRIVATE (object);
|
|
Milan Crha |
37c245 |
|
|
Milan Crha |
37c245 |
if (priv->store) {
|
|
Milan Crha |
37c245 |
g_object_unref (priv->store);
|
|
Milan Crha |
37c245 |
@@ -785,6 +801,7 @@ e_cal_backend_weather_class_init (ECalBa
|
|
Milan Crha |
37c245 |
backend_class = (ECalBackendClass *) class;
|
|
Milan Crha |
37c245 |
sync_class = (ECalBackendSyncClass *) class;
|
|
Milan Crha |
37c245 |
|
|
Milan Crha |
37c245 |
+ object_class->dispose = e_cal_backend_weather_dispose;
|
|
Milan Crha |
37c245 |
object_class->finalize = e_cal_backend_weather_finalize;
|
|
Milan Crha |
37c245 |
|
|
Milan Crha |
37c245 |
/* Execute one method at a time. */
|