** Fix for bug #440426
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. svn path=/trunk/; revision=35065
This commit is contained in:
@ -1,3 +1,10 @@
|
||||
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
|
||||
|
||||
@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user