[evolution-ews/gnome-3-4] Remove refresh_timeout in ECalBackendEws' dispose, rather than finalize
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews/gnome-3-4] Remove refresh_timeout in ECalBackendEws' dispose, rather than finalize
- Date: Wed, 8 Aug 2012 11:17:58 +0000 (UTC)
commit e624a91d93de879c2e9823e30277959bfb39a2ba
Author: Milan Crha <mcrha redhat com>
Date: Wed Aug 8 13:17:37 2012 +0200
Remove refresh_timeout in ECalBackendEws' dispose, rather than finalize
src/calendar/e-cal-backend-ews.c | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
index 572aa96..c1ebaa7 100644
--- a/src/calendar/e-cal-backend-ews.c
+++ b/src/calendar/e-cal-backend-ews.c
@@ -3944,6 +3944,20 @@ e_cal_backend_ews_notify_online_cb (ECalBackend *backend,
static void
e_cal_backend_ews_dispose (GObject *object)
{
+ ECalBackendEws *cbews;
+ ECalBackendEwsPrivate *priv;
+
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (E_IS_CAL_BACKEND_EWS (object));
+
+ cbews = E_CAL_BACKEND_EWS (object);
+ priv = cbews->priv;
+
+ if (priv->refresh_timeout) {
+ g_source_remove (priv->refresh_timeout);
+ priv->refresh_timeout = 0;
+ }
+
if (G_OBJECT_CLASS (parent_class)->dispose)
(* G_OBJECT_CLASS (parent_class)->dispose) (object);
}
@@ -3995,11 +4009,6 @@ e_cal_backend_ews_finalize (GObject *object)
priv->default_zone = NULL;
}
- if (priv->refresh_timeout) {
- g_source_remove (priv->refresh_timeout);
- priv->refresh_timeout = 0;
- }
-
g_hash_table_destroy (priv->item_id_hash);
e_credentials_free (priv->credentials);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]