Changed attachData to accept a sequence of chars rather than a string.

2001-06-20  Dave Camp  <dave@ximian.com>

	* Evolution-Composer.idl: Changed attachData to accept a sequence of
	chars rather than a string.

	* evolution-composer.c (impl_Composer_attach_data): Changed the 'data'
	argument to a GNOME_Evolution_Composer_AttachmentData, and pass
	data->_buffer and data->_length to camel_mime_part_set_content().

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  Dave Camp  <dave@ximian.com>

	* backend/ebook/e-card.c (e_card_list_send): Changed attach_data
	to be a GNOME_Evolution_Composer_AttachmentData rather than a
	CORBA_char*.

svn path=/trunk/; revision=10343
This commit is contained in:
Dave Camp
2001-06-20 18:29:03 +00:00
committed by Dave Camp
parent 51ba0332fc
commit 90aba2dbfd
7 changed files with 40 additions and 8 deletions

View File

@ -1,3 +1,9 @@
2001-06-20 Dave Camp <dave@ximian.com>
* backend/ebook/e-card.c (e_card_list_send): Changed attach_data
to be a GNOME_Evolution_Composer_AttachmentData rather than a
CORBA_char*.
2001-06-19 Chris Toshok <toshok@ximian.com>
* gui/widgets/e-addressbook-view.c (table_double_click): track

View File

@ -3744,10 +3744,11 @@ e_card_list_send (GList *cards, ECardDisposition disposition)
}
if (disposition == E_CARD_DISPOSITION_AS_ATTACHMENT) {
CORBA_char *content_type, *filename, *description, *attach_data;
CORBA_char *content_type, *filename, *description;
GNOME_Evolution_Composer_AttachmentData *attach_data;
CORBA_boolean show_inline;
char *tempstr;
content_type = CORBA_string_dup ("text/x-vcard");
filename = CORBA_string_dup ("");
@ -3768,7 +3769,10 @@ e_card_list_send (GList *cards, ECardDisposition disposition)
show_inline = FALSE;
tempstr = e_card_list_get_vcard (cards);
attach_data = CORBA_string_dup (tempstr);
attach_data = GNOME_Evolution_Composer_AttachmentData__alloc();
attach_data->_maximum = attach_data->_length = strlen (tempstr);
attach_data->_buffer = CORBA_sequence_CORBA_char_allocbuf (attach_data->_length);
strcpy (attach_data->_buffer, tempstr);
g_free (tempstr);
GNOME_Evolution_Composer_attachData (composer_server,

View File

@ -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

View File

@ -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);
}

View File

@ -1,3 +1,12 @@
2001-06-20 Dave Camp <dave@ximian.com>
* Evolution-Composer.idl: Changed attachData to accept a sequence of
chars rather than a string.
* evolution-composer.c (impl_Composer_attach_data): Changed the 'data'
argument to a GNOME_Evolution_Composer_AttachmentData, and pass
data->_buffer and data->_length to camel_mime_part_set_content().
2001-06-19 JP Rosevear <jpr@ximian.com>
* evolution-composer.c (impl_Composer_send): send the message

View File

@ -20,6 +20,8 @@ module Evolution {
};
typedef sequence<Recipient> RecipientList;
typedef sequence<char> AttachmentData;
/**
* setHeaders:
* @to: the "To" recipients
@ -81,7 +83,7 @@ module Evolution {
in string filename,
in string description,
in boolean show_inline,
in string data);
in AttachmentData data);
/**
* show:

View File

@ -158,7 +158,7 @@ impl_Composer_attach_data (PortableServer_Servant servant,
const CORBA_char *filename,
const CORBA_char *description,
const CORBA_boolean show_inline,
const CORBA_char *data,
const GNOME_Evolution_Composer_AttachmentData *data,
CORBA_Environment *ev)
{
BonoboObject *bonobo_object;
@ -169,7 +169,7 @@ impl_Composer_attach_data (PortableServer_Servant servant,
composer = EVOLUTION_COMPOSER (bonobo_object);
attachment = camel_mime_part_new ();
camel_mime_part_set_content (attachment, data, strlen (data),
camel_mime_part_set_content (attachment, data->_buffer, data->_length,
content_type);
if (*filename)