From 95e875ecf4b48f84fe6b9dd475669396a9609e20 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Mon, 17 Dec 2001 20:07:22 +0000 Subject: use get_real_item (get_refresh_options): uncomment out (get_real_item): 2001-12-17 JP Rosevear * gui/e-itip-control.c (send_item): use get_real_item (get_refresh_options): uncomment out (get_real_item): obtain the real object which has the uid of the item received (show_current_todo): use get_refresh_options for refresh method and provide the description and summary from the real component since its not in the reply (show_current_event): ditto (send_item): use get_real_item 2001-12-17 JP Rosevear * gui/itip-utils.c (comp_limit_attendees): can't remove properties in an iteration loop, so remove them outside the loop (comp_minimal): don't set a recurid if there isn't one, add the x properties to the clone (comp_compliant): unref the clone for DECLINECOUNTER * gui/e-itip-control.c (get_refresh_options): make function available again (show_current_event): use it here (ok_clicked_cb): can't remove properties in an iteration loop, so remove them outside the loop * cal-util/cal-component.c (free_icalcomponent): properly free the attendee list (cal_component_rescan): don't destroy the alarm hash svn path=/trunk/; revision=15136 --- calendar/cal-util/cal-component.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'calendar/cal-util') diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c index eeb51c79f6..513c98673e 100644 --- a/calendar/cal-util/cal-component.c +++ b/calendar/cal-util/cal-component.c @@ -275,7 +275,8 @@ static void free_icalcomponent (CalComponent *comp, gboolean free) { CalComponentPrivate *priv; - + GSList *l; + priv = comp->priv; if (!priv->icalcomp) @@ -294,6 +295,11 @@ free_icalcomponent (CalComponent *comp, gboolean free) priv->status = NULL; + for (l = priv->attendee_list; l != NULL; l = l->next) + g_free (l->data); + g_slist_free (priv->attendee_list); + priv->attendee_list = NULL; + priv->categories = NULL; priv->classification = NULL; @@ -1078,9 +1084,8 @@ cal_component_rescan (CalComponent *comp) /* Clear everything out */ free_icalcomponent (comp, FALSE); - g_hash_table_destroy (priv->alarm_uid_hash); - priv->alarm_uid_hash = NULL; + /* Rescan */ scan_icalcomponent (comp); ensure_mandatory_properties (comp); } -- cgit