From 2dc419ef1712eeb6d2668a0366c50a8a3ff1f665 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 20 Feb 2008 17:08:22 +0000 Subject: ** Fix for bug #440426 2008-02-20 Milan Crha ** Fix for bug #440426 * gui/e-cal-model.c: (e_cal_model_dispose), (remove_client): Unset also default_client if removing it. svn path=/trunk/; revision=35065 --- calendar/ChangeLog | 7 +++++++ calendar/gui/e-cal-model.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index e57cd09a73..9b5796052c 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2008-02-20 Milan Crha + + ** 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 ** Part of fix for bug #515744 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); -- cgit