aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/itip-utils.c8
2 files changed, 13 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 4eacedf2b2..ded9f6d2d7 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-20 Dave Camp <dave@ximian.com>
+
+ * gui/itip-utils.c (itip_send_comp): Changed attach_data
+ to be a GNOME_Evolution_Composer_AttachmentData rather than a
+ CORBA_char*.
+
2001-06-20 JP Rosevear <jpr@ximian.com>
* gui/dialogs/comp-editor.c (print_cmd): print menu command
@@ -22,6 +28,7 @@
* gui/dialogs/send-comp.c (send_component_dialog): remove useless
assignment
+>>>>>>> 1.910
2001-06-20 Rodrigo Moya <rodrigo@ximian.com>
* idl/evolution-calendar.idl: added getFreeBusy method
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 797d375821..b407f38693 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -114,7 +114,8 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *comp)
gint len;
CalComponentText caltext;
CalComponentOrganizer organizer;
- CORBA_char *content_type, *filename, *description, *attach_data;
+ CORBA_char *content_type, *filename, *description;
+ GNOME_Evolution_Composer_AttachmentData *attach_data;
CORBA_boolean show_inline;
CORBA_char tempstr[200];
@@ -232,7 +233,10 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *comp)
icalcomponent_add_component (icomp, clone);
ical_string = icalcomponent_as_ical_string (icomp);
- attach_data = CORBA_string_dup (ical_string);
+ attach_data = GNOME_Evolution_Composer_AttachmentData__alloc ();
+ attach_data->_maximum = attach_data->_length = strlen (ical_string);
+ attach_data->_buffer = CORBA_sequence_CORBA_char_allocbuf (attach_data->_length);
+ strcpy (attach_data->_buffer, ical_string);
icalcomponent_free (icomp);
}