diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/itip-utils.c | 15 |
2 files changed, 15 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index e077b3986e..8767bee865 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2006-02-23 Chenthill Palanisamy <pchenthill@novell.com> + + Fixes #330677 + * gui/itip-utils.c: + (comp_content_type): Removed the content setting as text/plain. + (itip_send_comp): Changed the reply all to FALSE. + (reply_to_calendar_comp): Set the content type as text/plain. + 2006-02-15 Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in> * gui/dialogs/memo-page.glade: Changed the layout spacing of memo diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 67b886892b..08af83cab3 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -723,12 +723,9 @@ comp_content_type (ECalComponent *comp, ECalComponentItipMethod method) { char tmp[256]; - if (method == E_CAL_COMPONENT_METHOD_REPLY) { - sprintf (tmp, "text/plain"); - } else - sprintf (tmp, "text/calendar; name=\"%s\"; charset=utf-8; METHOD=%s", - e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_FREEBUSY ? - "freebusy.ifb" : "calendar.ics", itip_methods[method]); + sprintf (tmp, "text/calendar; name=\"%s\"; charset=utf-8; METHOD=%s", + e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_FREEBUSY ? + "freebusy.ifb" : "calendar.ics", itip_methods[method]); return CORBA_string_dup (tmp); @@ -1182,7 +1179,7 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp, goto cleanup; /* Recipients */ - to_list = comp_to_list (method, comp, users, TRUE); + to_list = comp_to_list (method, comp, users, FALSE); if (method != E_CAL_COMPONENT_METHOD_PUBLISH) { if (to_list == NULL || to_list->_length == 0) { /* We sent them all via the server */ @@ -1336,6 +1333,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method, ECalComponent *send_comp GNOME_Evolution_Composer_RecipientList *cc_list = NULL; GNOME_Evolution_Composer_RecipientList *bcc_list = NULL; CORBA_char *subject = NULL, *content_type = NULL; + char tmp [256]; CORBA_char *from = NULL; char *ical_string; CORBA_Environment ev; @@ -1388,7 +1386,8 @@ reply_to_calendar_comp (ECalComponentItipMethod method, ECalComponent *send_comp /* Content type */ - content_type = comp_content_type (comp, method); + sprintf (tmp, "text/plain"); + content_type = CORBA_string_dup (tmp); top_level = comp_toplevel_with_zones (method, comp, client, zones); ical_string = icalcomponent_as_ical_string (top_level); |