aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-cal-model.c4
2 files changed, 11 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e57cd09a73..9b5796052c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,12 @@
2008-02-20 Milan Crha <mcrha@redhat.com>
+ ** Fix for bug #440426
+
+ * gui/e-cal-model.c: (e_cal_model_dispose), (remove_client):
+ Unset also default_client if removing it.
+
+2008-02-20 Milan Crha <mcrha@redhat.com>
+
** Part of fix for bug #515744
* gui/dialogs/comp-editor.c: (drop_action):
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 3fda497431..19fb146d3e 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -242,6 +242,7 @@ e_cal_model_dispose (GObject *object)
}
priv->clients = NULL;
+ priv->default_client = NULL;
}
if (G_OBJECT_CLASS (e_cal_model_parent_class)->dispose)
@@ -1701,6 +1702,9 @@ remove_client (ECalModel *model, ECalModelClient *client_data)
return;
}
+ if (model->priv->default_client == client_data->client)
+ model->priv->default_client = NULL;
+
/* Remove the client from the list */
model->priv->clients = g_list_remove (model->priv->clients, client_data);