From 98087d1543dff4c0f1cf70b88c634ebe3bcbb656 Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Mon, 13 Aug 2007 10:40:23 +0000 Subject: reviewed by: Chenthill Palanisamy 2007-08-13 Suman Manjunath reviewed by: Chenthill Palanisamy * gui/dialogs/event-page.c: (event_page_init), (sensitize_widgets), (get_current_account), (event_page_fill_widgets), (event_page_fill_component), (existing_attendee), (event_page_set_info_string), (get_widgets), (source_changed_cb), (init_widgets), (event_page_select_organizer), (event_page_construct): * gui/dialogs/event-page.glade: * gui/dialogs/memo-page.c: (memo_page_init), * (sensitize_widgets), (memo_page_fill_widgets), (get_current_account), (memo_page_fill_component), (memo_page_set_info_string), (get_widgets), (source_changed_cb), (init_widgets), (memo_page_select_organizer), (memo_page_construct): * gui/dialogs/memo-page.glade: * gui/dialogs/task-page.c: (task_page_init), * (sensitize_widgets), (get_current_account), (task_page_fill_widgets), (task_page_fill_component), (existing_attendee), (task_page_set_info_string), (get_widgets), (source_changed_cb), (init_widgets), (task_page_select_organizer), (task_page_construct): * gui/dialogs/task-page.glade: Add a label on the top to show * information string for calendar, task and memo editors. It would be shown while operating on subscribed user's folder items. * gui/itip-utils.c: (itip_send_comp), (reply_to_calendar_comp): * A utility function sanitize_component has been removed. The sentby parameter is set in the event pages. --This line, and those below, will be ignored-- M calendar/gui/dialogs/task-page.glade M calendar/gui/dialogs/task-page.c M calendar/gui/dialogs/task-page.h M calendar/gui/dialogs/event-page.glade M calendar/gui/dialogs/memo-page.glade M calendar/gui/dialogs/event-page.c M calendar/gui/dialogs/event-page.h M calendar/gui/dialogs/memo-page.c M calendar/gui/dialogs/memo-page.h M calendar/gui/itip-utils.c M calendar/ChangeLog svn path=/trunk/; revision=33996 --- calendar/gui/itip-utils.c | 76 ----------------------------------------------- 1 file changed, 76 deletions(-) (limited to 'calendar/gui/itip-utils.c') diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 06a1b9a91e..e77a3a895b 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -222,78 +222,6 @@ html_new_lines_for (char *string) return html_string; } -void -sanitize_component (ECalComponent *comp, ECal *client) -{ - GSList *attendees; - EAccountList *al; - EAccount *a; - EIterator *it; - ECalComponentOrganizer organizer; - ECalComponentAttendee *attendee = NULL; - ESource *cal_source = NULL; - char *backend_address = NULL; - char *subscriber_address = NULL; - - e_cal_component_get_attendee_list (comp, &attendees); - al = itip_addresses_get (); - e_cal_get_cal_address (client, &backend_address, NULL); - if (!al || !backend_address) - return; - - /* Look for the backend address in the list of enabled accounts */ - for (it = e_list_get_iterator((EList *)al); - e_iterator_is_valid(it); - e_iterator_next(it)) { - - a = (EAccount *) e_iterator_get(it); - if (!a->enabled) - continue; - - if (!g_ascii_strcasecmp (a->id->address, backend_address)) { - e_cal_component_free_attendee_list (attendees); - g_free (backend_address); - return; - } - } - - /* Backend address was not found in the list of accounts. Check if its a foreign/susbcribed backend */ - cal_source = e_cal_get_source (client); - if (!cal_source) { - e_cal_component_free_attendee_list (attendees); - g_free (backend_address); - return; - } - - subscriber_address = e_source_get_property (cal_source, "subscriber"); - if (!subscriber_address) { - e_cal_component_free_attendee_list (attendees); - g_free (backend_address); - return; - } - - attendee = get_attendee (attendees, backend_address); - e_cal_component_get_organizer (comp, &organizer) ; - - e_cal_component_free_attendee_list (attendees); - - if (organizer.value && !g_ascii_strcasecmp (itip_strip_mailto (organizer.value), subscriber_address)) { - ECalComponentOrganizer new_organizer; - new_organizer.value = g_strdup_printf ("MAILTO:%s", backend_address); - new_organizer.cn = (attendee && attendee->cn) ? g_strdup (attendee->cn) : g_strdup (backend_address); - new_organizer.sentby = g_strdup (organizer.value); - new_organizer.language = g_strdup (organizer.language); - e_cal_component_set_organizer (comp, &new_organizer); - } - else if (attendee) { - attendee->sentby = g_strdup_printf ("MAILTO:%s", subscriber_address); - } - - e_cal_component_rescan (comp); - g_free (backend_address); - g_free (subscriber_address); -} - char * itip_get_comp_attendee (ECalComponent *comp, ECal *client) { @@ -1313,7 +1241,6 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp, /* Give the server a chance to manipulate the comp */ if (method != E_CAL_COMPONENT_METHOD_PUBLISH) { - sanitize_component (send_comp, client); if (!comp_server_send (method, send_comp, client, zones, &users)) goto cleanup; } @@ -1486,9 +1413,6 @@ reply_to_calendar_comp (ECalComponentItipMethod method, ECalComponent *send_comp CORBA_exception_init (&ev); - /* Sanitize the component */ - sanitize_component (send_comp, client); - /* Tidy up the comp */ comp = comp_compliant (method, send_comp, client, zones); if (comp == NULL) -- cgit v1.2.3