diff options
-rw-r--r-- | calendar/ChangeLog | 8 | ||||
-rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index d12dd4e5a9..d533122b16 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2005-03-08 Chenthill Palanisamy <pchenthill@novell.com> + + Fixes #73141 + * gui/dialogs/comp-editor.c: + (comp_editor_notify_client_changed):Assign the updated client + to priv->client and unref the old one. + 2005-03-06 Rodrigo Moya <rodrigo@novell.com> * gui/dialogs/recur-comp.c (recur_component_dialog): disable dialog for @@ -21,6 +28,7 @@ (open_alarm_dialog): store the dialog returned by alarm_notify_dialog(). (tray_icon_destroyed_cb): destroy the dialog if still around. +>>>>>>> 1.2682 2005-02-28 Harish Krishnaswamy <kharish@novell.com> Fixes #69556 diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 638a000f2a..8286b444e8 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -2004,6 +2004,9 @@ comp_editor_notify_client_changed (CompEditor *editor, ECal *client) priv = editor->priv; priv->changed = TRUE; + + g_object_unref (priv->client); + priv->client = client; comp_editor_set_e_cal (editor, client); for (l = priv->pages; l != NULL; l = l->next) |