added this from the composer IDL sources

        * gui/Evolution-Composer.idl: added this from the composer IDL sources

        * gui/Makefile.am: changed to reflect the above IDL and the associated
        orbit-idl generated files.

        * gui/Evolution-Composer.h,
          gui/Evolution-Composer-common.c,
          gui/Evolution-Composer-stubs.c,
          gui/Evolution-Composer-skels.c:
       the generated files, as per the above description.

        * gui/e-meeting-edit.c: more work towards mailer integration.

svn path=/trunk/; revision=6174

7 files changed, 2425 insertions, 6 deletions

diff --git a/calendar/gui/Evolution-Composer-common.c b/calendar/gui/Evolution-Composer-common.c
new file mode 100644
index 0000000000..971d8f1320
--- /dev/null
+++ b/calendar/gui/Evolution-Composer-common.c
@@ -0,0 +1,331 @@
+/*
+ * This file was generated by orbit-idl - DO NOT EDIT!
+ */
+
+#include <string.h>
+#include "Evolution-Composer.h"
+
+#if ( (TC_IMPL_TC_Evolution_Composer_0 == 'E') \
+&& (TC_IMPL_TC_Evolution_Composer_1 == 'v') \
+&& (TC_IMPL_TC_Evolution_Composer_2 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_3 == 'l') \
+&& (TC_IMPL_TC_Evolution_Composer_4 == 'u') \
+&& (TC_IMPL_TC_Evolution_Composer_5 == 't') \
+&& (TC_IMPL_TC_Evolution_Composer_6 == 'i') \
+&& (TC_IMPL_TC_Evolution_Composer_7 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_8 == 'n') \
+&& (TC_IMPL_TC_Evolution_Composer_9 == '_') \
+&& (TC_IMPL_TC_Evolution_Composer_10 == 'C') \
+&& (TC_IMPL_TC_Evolution_Composer_11 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_12 == 'm') \
+&& (TC_IMPL_TC_Evolution_Composer_13 == 'p') \
+&& (TC_IMPL_TC_Evolution_Composer_14 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_15 == 's') \
+&& (TC_IMPL_TC_Evolution_Composer_16 == 'e') \
+&& (TC_IMPL_TC_Evolution_Composer_17 == 'r') \
+) && !defined(TC_DEF_TC_Evolution_Composer)
+#define TC_DEF_TC_Evolution_Composer 1
+const struct CORBA_TypeCode_struct TC_Evolution_Composer_struct = {
+   
+      {{(ORBit_RootObject_Interface *) & ORBit_TypeCode_epv, TRUE, -1},
+    ORBIT_PSEUDO_TYPECODE},
+
+   CORBA_tk_objref, "Composer", "IDL:Evolution/Composer:1.0",
+   0, 0,
+   NULL,
+   NULL,
+   NULL,
+   CORBA_OBJECT_NIL, 0, -1, 0, 0
+};
+#endif
+#if ( (TC_IMPL_TC_Evolution_Composer_Recipient_0 == 'E') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_1 == 'v') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_2 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_3 == 'l') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_4 == 'u') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_5 == 't') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_6 == 'i') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_7 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_8 == 'n') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_9 == '_') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_10 == 'C') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_11 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_12 == 'm') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_13 == 'p') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_14 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_15 == 's') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_16 == 'e') \
+&& (TC_IMPL_TC_Evolution_Composer_Recipient_17 == 'r') \
+) && !defined(TC_DEF_TC_Evolution_Composer_Recipient)
+#define TC_DEF_TC_Evolution_Composer_Recipient 1
+static const char *anon_subnames_array5[] = { "name", "address" };
+static const CORBA_TypeCode anon_subtypes_array6[] =
+   { (CORBA_TypeCode) & TC_CORBA_string_struct,
+      (CORBA_TypeCode) & TC_CORBA_string_struct };
+const struct CORBA_TypeCode_struct TC_Evolution_Composer_Recipient_struct = {
+   
+      {{(ORBit_RootObject_Interface *) & ORBit_TypeCode_epv, TRUE, -1},
+    ORBIT_PSEUDO_TYPECODE},
+
+   CORBA_tk_struct, "Recipient", "IDL:Evolution/Composer/Recipient:1.0",
+   0, 2,
+   (const char **) anon_subnames_array5,
+   (CORBA_TypeCode *) anon_subtypes_array6,
+   NULL,
+   CORBA_OBJECT_NIL, 0, -1, 0, 0
+};
+#endif
+#if ( (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0 == 'E') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_1 == 'v') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_2 == 'o') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_3 == 'l') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_4 == 'u') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_5 == 't') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_6 == 'i') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_7 == 'o') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_8 == 'n') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_9 == '_') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_10 == 'C') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_11 == 'o') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_12 == 'm') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_13 == 'p') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_14 == 'o') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_15 == 's') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_16 == 'e') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_17 == 'r') \
+) && !defined(TC_DEF_TC_CORBA_sequence_Evolution_Composer_Recipient)
+#define TC_DEF_TC_CORBA_sequence_Evolution_Composer_Recipient 1
+static const CORBA_TypeCode anon_subtypes_array10[] =
+   { (CORBA_TypeCode) & TC_Evolution_Composer_Recipient_struct };
+const struct CORBA_TypeCode_struct
+   TC_CORBA_sequence_Evolution_Composer_Recipient_struct = {
+   {{(ORBit_RootObject_Interface *) & ORBit_TypeCode_epv, TRUE, -1},
+    ORBIT_PSEUDO_TYPECODE},
+   CORBA_tk_sequence, NULL, NULL,
+   0, 1,
+   NULL,
+   (CORBA_TypeCode *) anon_subtypes_array10,
+   NULL,
+   CORBA_OBJECT_NIL, 0, -1, 0, 0
+};
+#endif
+#if ( (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0 == 'E') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_1 == 'v') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_2 == 'o') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_3 == 'l') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_4 == 'u') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_5 == 't') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_6 == 'i') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_7 == 'o') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_8 == 'n') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_9 == '_') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_10 == 'C') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_11 == 'o') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_12 == 'm') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_13 == 'p') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_14 == 'o') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_15 == 's') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_16 == 'e') \
+&& (TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_17 == 'r') \
+) && !defined(TC_DEF_TC_CORBA_sequence_Evolution_Composer_Recipient)
+#define TC_DEF_TC_CORBA_sequence_Evolution_Composer_Recipient 1
+static const CORBA_TypeCode anon_subtypes_array19[] =
+   { (CORBA_TypeCode) & TC_Evolution_Composer_Recipient_struct };
+const struct CORBA_TypeCode_struct
+   TC_CORBA_sequence_Evolution_Composer_Recipient_struct = {
+   {{(ORBit_RootObject_Interface *) & ORBit_TypeCode_epv, TRUE, -1},
+    ORBIT_PSEUDO_TYPECODE},
+   CORBA_tk_sequence, NULL, NULL,
+   0, 1,
+   NULL,
+   (CORBA_TypeCode *) anon_subtypes_array19,
+   NULL,
+   CORBA_OBJECT_NIL, 0, -1, 0, 0
+};
+#endif
+#if ( (TC_IMPL_TC_Evolution_Composer_RecipientList_0 == 'E') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_1 == 'v') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_2 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_3 == 'l') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_4 == 'u') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_5 == 't') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_6 == 'i') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_7 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_8 == 'n') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_9 == '_') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_10 == 'C') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_11 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_12 == 'm') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_13 == 'p') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_14 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_15 == 's') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_16 == 'e') \
+&& (TC_IMPL_TC_Evolution_Composer_RecipientList_17 == 'r') \
+) && !defined(TC_DEF_TC_Evolution_Composer_RecipientList)
+#define TC_DEF_TC_Evolution_Composer_RecipientList 1
+static const CORBA_TypeCode anon_subtypes_array23[] =
+   { (CORBA_TypeCode) & TC_CORBA_sequence_Evolution_Composer_Recipient_struct
+
+   };
+const struct CORBA_TypeCode_struct TC_Evolution_Composer_RecipientList_struct
+   = {
+   {{(ORBit_RootObject_Interface *) & ORBit_TypeCode_epv, TRUE, -1},
+    ORBIT_PSEUDO_TYPECODE},
+   CORBA_tk_alias, "RecipientList",
+      "IDL:Evolution/Composer/RecipientList:1.0",
+
+   0, 1,
+   NULL,
+   (CORBA_TypeCode *) anon_subtypes_array23,
+   NULL,
+   CORBA_OBJECT_NIL, 0, -1, 0, 0
+};
+#endif
+#if ( (TC_IMPL_TC_Evolution_Composer_CouldNotParse_0 == 'E') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_1 == 'v') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_2 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_3 == 'l') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_4 == 'u') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_5 == 't') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_6 == 'i') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_7 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_8 == 'n') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_9 == '_') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_10 == 'C') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_11 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_12 == 'm') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_13 == 'p') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_14 == 'o') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_15 == 's') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_16 == 'e') \
+&& (TC_IMPL_TC_Evolution_Composer_CouldNotParse_17 == 'r') \
+) && !defined(TC_DEF_TC_Evolution_Composer_CouldNotParse)
+#define TC_DEF_TC_Evolution_Composer_CouldNotParse 1
+const struct CORBA_TypeCode_struct TC_Evolution_Composer_CouldNotParse_struct
+   = {
+   {{(ORBit_RootObject_Interface *) & ORBit_TypeCode_epv, TRUE, -1},
+    ORBIT_PSEUDO_TYPECODE},
+   CORBA_tk_except, "CouldNotParse",
+      "IDL:Evolution/Composer/CouldNotParse:1.0",
+   0, 0,
+   NULL,
+   NULL,
+   NULL,
+   CORBA_OBJECT_NIL, 0, -1, 0, 0
+};
+#endif
+gpointer
+Evolution_Composer_Recipient__free(gpointer mem, gpointer dat,
+				   CORBA_boolean free_strings)
+{
+   Evolution_Composer_Recipient *var = mem;
+
+   if (free_strings) {
+      CORBA_string__free(&(var->name), NULL, free_strings);
+   }
+   if (free_strings) {
+      CORBA_string__free(&(var->address), NULL, free_strings);
+   }
+   return (gpointer) (var + 1);
+}
+
+Evolution_Composer_Recipient *
+Evolution_Composer_Recipient__alloc(void)
+{
+   Evolution_Composer_Recipient *retval;
+
+   retval =
+      ORBit_alloc(sizeof(Evolution_Composer_Recipient),
+		  (ORBit_free_childvals) Evolution_Composer_Recipient__free,
+		  GUINT_TO_POINTER(1));
+   memset(&(retval->name), '\0', sizeof(retval->name));
+   memset(&(retval->address), '\0', sizeof(retval->address));
+   return retval;
+}
+
+#if ( (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_0 == 'E') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_1 == 'v') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_2 == 'o') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_3 == 'l') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_4 == 'u') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_5 == 't') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_6 == 'i') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_7 == 'o') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_8 == 'n') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_9 == '_') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_10 == 'C') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_11 == 'o') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_12 == 'm') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_13 == 'p') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_14 == 'o') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_15 == 's') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_16 == 'e') \
+&& (ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_17 == 'r') \
+) && !defined(ORBIT_DEF_CORBA_sequence_Evolution_Composer_Recipient)
+#define ORBIT_DEF_CORBA_sequence_Evolution_Composer_Recipient 1
+
+gpointer
+CORBA_sequence_Evolution_Composer_Recipient__free(gpointer mem, gpointer dat,
+						  CORBA_boolean free_strings)
+{
+   CORBA_sequence_Evolution_Composer_Recipient *val = mem;
+
+   if (val->_release)
+      ORBit_free(val->_buffer, free_strings);
+   return (gpointer) (val + 1);
+}
+
+CORBA_sequence_Evolution_Composer_Recipient *
+CORBA_sequence_Evolution_Composer_Recipient__alloc(void)
+{
+   CORBA_sequence_Evolution_Composer_Recipient *retval;
+
+   retval =
+      ORBit_alloc(sizeof(CORBA_sequence_Evolution_Composer_Recipient),
+		  (ORBit_free_childvals)
+		  CORBA_sequence_Evolution_Composer_Recipient__free,
+		  GUINT_TO_POINTER(1));
+   retval->_maximum = 0;
+   retval->_length = 0;
+   retval->_buffer = NULL;
+   retval->_release = CORBA_FALSE;
+   return retval;
+}
+
+Evolution_Composer_Recipient *
+CORBA_sequence_Evolution_Composer_Recipient_allocbuf(CORBA_unsigned_long len)
+{
+   Evolution_Composer_Recipient *retval =
+      ORBit_alloc(sizeof(Evolution_Composer_Recipient) * len,
+		  (ORBit_free_childvals) Evolution_Composer_Recipient__free,
+		  GUINT_TO_POINTER(len));
+
+   memset(retval, '\0', sizeof(Evolution_Composer_Recipient) * len);
+   return retval;
+}
+#endif
+
+gpointer
+Evolution_Composer_RecipientList__free(gpointer mem, gpointer dat,
+				       CORBA_boolean free_strings)
+{
+   return CORBA_sequence_Evolution_Composer_Recipient__free(mem, dat,
+							    free_strings);
+}
+
+Evolution_Composer_RecipientList *
+Evolution_Composer_RecipientList__alloc(void)
+{
+   return CORBA_sequence_Evolution_Composer_Recipient__alloc();
+}
+
+gpointer
+Evolution_Composer_CouldNotParse__free(gpointer mem, gpointer dat,
+				       CORBA_boolean free_strings)
+{
+   Evolution_Composer_CouldNotParse *var = mem;
+
+   return (gpointer) (var + 1);
+}
+
+CORBA_unsigned_long Evolution_Composer__classid = 0;
diff --git a/calendar/gui/Evolution-Composer-skels.c b/calendar/gui/Evolution-Composer-skels.c
new file mode 100644
index 0000000000..2883627e0e
--- /dev/null
+++ b/calendar/gui/Evolution-Composer-skels.c
@@ -0,0 +1,689 @@
+/*
+ * This file was generated by orbit-idl - DO NOT EDIT!
+ */
+
+#include <string.h>
+#include "Evolution-Composer.h"
+
+void
+_ORBIT_skel_Evolution_Composer_set_headers(POA_Evolution_Composer *
+					   _ORBIT_servant,
+					   GIOPRecvBuffer *
+					   _ORBIT_recv_buffer,
+					   CORBA_Environment * ev,
+					   void (*_impl_set_headers)
+					   (PortableServer_Servant _servant,
+					    const
+					    Evolution_Composer_RecipientList *
+					    to,
+					    const
+					    Evolution_Composer_RecipientList *
+					    cc,
+					    const
+					    Evolution_Composer_RecipientList *
+					    bcc, const CORBA_char * subject,
+					    CORBA_Environment * ev))
+{
+   Evolution_Composer_RecipientList to = { 0, 0, NULL, CORBA_FALSE };
+   Evolution_Composer_RecipientList cc = { 0, 0, NULL, CORBA_FALSE };
+   Evolution_Composer_RecipientList bcc = { 0, 0, NULL, CORBA_FALSE };
+   CORBA_char *subject;
+
+   {				/* demarshalling */
+      guchar *_ORBIT_curptr;
+      register CORBA_unsigned_long _ORBIT_tmpvar_17;
+      register CORBA_unsigned_long _ORBIT_tmpvar_18;
+      CORBA_unsigned_long _ORBIT_tmpvar_19;
+      register CORBA_unsigned_long _ORBIT_tmpvar_20;
+      CORBA_unsigned_long _ORBIT_tmpvar_21;
+      register CORBA_unsigned_long _ORBIT_tmpvar_22;
+      register CORBA_unsigned_long _ORBIT_tmpvar_23;
+      CORBA_unsigned_long _ORBIT_tmpvar_24;
+      register CORBA_unsigned_long _ORBIT_tmpvar_25;
+      CORBA_unsigned_long _ORBIT_tmpvar_26;
+      register CORBA_unsigned_long _ORBIT_tmpvar_27;
+      register CORBA_unsigned_long _ORBIT_tmpvar_28;
+      CORBA_unsigned_long _ORBIT_tmpvar_29;
+      register CORBA_unsigned_long _ORBIT_tmpvar_30;
+      CORBA_unsigned_long _ORBIT_tmpvar_31;
+      register CORBA_unsigned_long _ORBIT_tmpvar_32;
+      CORBA_unsigned_long _ORBIT_tmpvar_33;
+
+      _ORBIT_curptr = GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur;
+      if (giop_msg_conversion_needed(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer))) {
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 
+	    (*((guint32 *) & (to._length))) =
+	    GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	    _ORBIT_curptr += 4;
+	 to._buffer =
+	    alloca(sizeof(to._buffer[_ORBIT_tmpvar_17]) * to._length);
+	 to._release = CORBA_FALSE;
+	 for (_ORBIT_tmpvar_17 = 0; _ORBIT_tmpvar_17 < to._length;
+	      _ORBIT_tmpvar_17++) {
+	    _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	    
+	       (*((guint32 *) & (_ORBIT_tmpvar_19))) =
+	       GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	    _ORBIT_curptr += 4;
+	    to._buffer[_ORBIT_tmpvar_17].name = (void *) _ORBIT_curptr;
+	    _ORBIT_curptr +=
+	       sizeof(to._buffer[_ORBIT_tmpvar_17].name[_ORBIT_tmpvar_18]) *
+	       _ORBIT_tmpvar_19;
+	    _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	    
+	       (*((guint32 *) & (_ORBIT_tmpvar_21))) =
+	       GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	    _ORBIT_curptr += 4;
+	    to._buffer[_ORBIT_tmpvar_17].address = (void *) _ORBIT_curptr;
+	    _ORBIT_curptr +=
+	       sizeof(to._buffer[_ORBIT_tmpvar_17].
+		      address[_ORBIT_tmpvar_20]) * _ORBIT_tmpvar_21;
+	 }
+
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 
+	    (*((guint32 *) & (cc._length))) =
+	    GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	    _ORBIT_curptr += 4;
+	 cc._buffer =
+	    alloca(sizeof(cc._buffer[_ORBIT_tmpvar_22]) * cc._length);
+	 cc._release = CORBA_FALSE;
+	 for (_ORBIT_tmpvar_22 = 0; _ORBIT_tmpvar_22 < cc._length;
+	      _ORBIT_tmpvar_22++) {
+	    _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	    
+	       (*((guint32 *) & (_ORBIT_tmpvar_24))) =
+	       GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	    _ORBIT_curptr += 4;
+	    cc._buffer[_ORBIT_tmpvar_22].name = (void *) _ORBIT_curptr;
+	    _ORBIT_curptr +=
+	       sizeof(cc._buffer[_ORBIT_tmpvar_22].name[_ORBIT_tmpvar_23]) *
+	       _ORBIT_tmpvar_24;
+	    _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	    
+	       (*((guint32 *) & (_ORBIT_tmpvar_26))) =
+	       GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	    _ORBIT_curptr += 4;
+	    cc._buffer[_ORBIT_tmpvar_22].address = (void *) _ORBIT_curptr;
+	    _ORBIT_curptr +=
+	       sizeof(cc._buffer[_ORBIT_tmpvar_22].
+		      address[_ORBIT_tmpvar_25]) * _ORBIT_tmpvar_26;
+	 }
+
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 
+	    (*((guint32 *) & (bcc._length))) =
+	    GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	    _ORBIT_curptr += 4;
+	 bcc._buffer =
+	    alloca(sizeof(bcc._buffer[_ORBIT_tmpvar_27]) * bcc._length);
+	 bcc._release = CORBA_FALSE;
+	 for (_ORBIT_tmpvar_27 = 0; _ORBIT_tmpvar_27 < bcc._length;
+	      _ORBIT_tmpvar_27++) {
+	    _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	    
+	       (*((guint32 *) & (_ORBIT_tmpvar_29))) =
+	       GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	    _ORBIT_curptr += 4;
+	    bcc._buffer[_ORBIT_tmpvar_27].name = (void *) _ORBIT_curptr;
+	    _ORBIT_curptr +=
+	       sizeof(bcc._buffer[_ORBIT_tmpvar_27].name[_ORBIT_tmpvar_28]) *
+	       _ORBIT_tmpvar_29;
+	    _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	    
+	       (*((guint32 *) & (_ORBIT_tmpvar_31))) =
+	       GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	    _ORBIT_curptr += 4;
+	    bcc._buffer[_ORBIT_tmpvar_27].address = (void *) _ORBIT_curptr;
+	    _ORBIT_curptr +=
+	       sizeof(bcc._buffer[_ORBIT_tmpvar_27].
+		      address[_ORBIT_tmpvar_30]) * _ORBIT_tmpvar_31;
+	 }
+
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 
+	    (*((guint32 *) & (_ORBIT_tmpvar_33))) =
+	    GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	 _ORBIT_curptr += 4;
+	 subject = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr +=
+	    sizeof(subject[_ORBIT_tmpvar_32]) * _ORBIT_tmpvar_33;
+      } else {
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 to._length = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	 _ORBIT_curptr += 4;
+	 to._buffer =
+	    alloca(sizeof(to._buffer[_ORBIT_tmpvar_17]) * to._length);
+	 to._release = CORBA_FALSE;
+	 for (_ORBIT_tmpvar_17 = 0; _ORBIT_tmpvar_17 < to._length;
+	      _ORBIT_tmpvar_17++) {
+	    _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	    _ORBIT_tmpvar_19 = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	    _ORBIT_curptr += 4;
+	    to._buffer[_ORBIT_tmpvar_17].name = (void *) _ORBIT_curptr;
+	    _ORBIT_curptr +=
+	       sizeof(to._buffer[_ORBIT_tmpvar_17].name[_ORBIT_tmpvar_18]) *
+	       _ORBIT_tmpvar_19;
+	    _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	    _ORBIT_tmpvar_21 = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	    _ORBIT_curptr += 4;
+	    to._buffer[_ORBIT_tmpvar_17].address = (void *) _ORBIT_curptr;
+	    _ORBIT_curptr +=
+	       sizeof(to._buffer[_ORBIT_tmpvar_17].
+		      address[_ORBIT_tmpvar_20]) * _ORBIT_tmpvar_21;
+	 }
+
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 cc._length = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	 _ORBIT_curptr += 4;
+	 cc._buffer =
+	    alloca(sizeof(cc._buffer[_ORBIT_tmpvar_22]) * cc._length);
+	 cc._release = CORBA_FALSE;
+	 for (_ORBIT_tmpvar_22 = 0; _ORBIT_tmpvar_22 < cc._length;
+	      _ORBIT_tmpvar_22++) {
+	    _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	    _ORBIT_tmpvar_24 = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	    _ORBIT_curptr += 4;
+	    cc._buffer[_ORBIT_tmpvar_22].name = (void *) _ORBIT_curptr;
+	    _ORBIT_curptr +=
+	       sizeof(cc._buffer[_ORBIT_tmpvar_22].name[_ORBIT_tmpvar_23]) *
+	       _ORBIT_tmpvar_24;
+	    _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	    _ORBIT_tmpvar_26 = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	    _ORBIT_curptr += 4;
+	    cc._buffer[_ORBIT_tmpvar_22].address = (void *) _ORBIT_curptr;
+	    _ORBIT_curptr +=
+	       sizeof(cc._buffer[_ORBIT_tmpvar_22].
+		      address[_ORBIT_tmpvar_25]) * _ORBIT_tmpvar_26;
+	 }
+
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 bcc._length = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	 _ORBIT_curptr += 4;
+	 bcc._buffer =
+	    alloca(sizeof(bcc._buffer[_ORBIT_tmpvar_27]) * bcc._length);
+	 bcc._release = CORBA_FALSE;
+	 for (_ORBIT_tmpvar_27 = 0; _ORBIT_tmpvar_27 < bcc._length;
+	      _ORBIT_tmpvar_27++) {
+	    _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	    _ORBIT_tmpvar_29 = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	    _ORBIT_curptr += 4;
+	    bcc._buffer[_ORBIT_tmpvar_27].name = (void *) _ORBIT_curptr;
+	    _ORBIT_curptr +=
+	       sizeof(bcc._buffer[_ORBIT_tmpvar_27].name[_ORBIT_tmpvar_28]) *
+	       _ORBIT_tmpvar_29;
+	    _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	    _ORBIT_tmpvar_31 = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	    _ORBIT_curptr += 4;
+	    bcc._buffer[_ORBIT_tmpvar_27].address = (void *) _ORBIT_curptr;
+	    _ORBIT_curptr +=
+	       sizeof(bcc._buffer[_ORBIT_tmpvar_27].
+		      address[_ORBIT_tmpvar_30]) * _ORBIT_tmpvar_31;
+	 }
+
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 _ORBIT_tmpvar_33 = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	 _ORBIT_curptr += 4;
+	 subject = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr +=
+	    sizeof(subject[_ORBIT_tmpvar_32]) * _ORBIT_tmpvar_33;
+      }
+   }
+   _impl_set_headers(_ORBIT_servant, &(to), &(cc), &(bcc), subject, ev);
+   {				/* marshalling */
+      register GIOPSendBuffer *_ORBIT_send_buffer;
+
+      _ORBIT_send_buffer =
+	 giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->
+				    connection, NULL,
+				    _ORBIT_recv_buffer->message.u.request.
+				    request_id, ev->_major);
+      if (_ORBIT_send_buffer) {
+	 if (ev->_major == CORBA_NO_EXCEPTION) {
+	 } else
+	    ORBit_send_system_exception(_ORBIT_send_buffer, ev);
+	 giop_send_buffer_write(_ORBIT_send_buffer);
+	 giop_send_buffer_unuse(_ORBIT_send_buffer);
+      }
+   }
+}
+void
+_ORBIT_skel_Evolution_Composer_set_body_text(POA_Evolution_Composer *
+					     _ORBIT_servant,
+					     GIOPRecvBuffer *
+					     _ORBIT_recv_buffer,
+					     CORBA_Environment * ev,
+					     void (*_impl_set_body_text)
+					     (PortableServer_Servant _servant,
+					      const CORBA_char * body,
+					      CORBA_Environment * ev))
+{
+   CORBA_char *body;
+
+   {				/* demarshalling */
+      guchar *_ORBIT_curptr;
+      register CORBA_unsigned_long _ORBIT_tmpvar_2;
+      CORBA_unsigned_long _ORBIT_tmpvar_3;
+
+      _ORBIT_curptr = GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur;
+      if (giop_msg_conversion_needed(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer))) {
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 
+	    (*((guint32 *) & (_ORBIT_tmpvar_3))) =
+	    GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	 _ORBIT_curptr += 4;
+	 body = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr += sizeof(body[_ORBIT_tmpvar_2]) * _ORBIT_tmpvar_3;
+      } else {
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 _ORBIT_tmpvar_3 = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	 _ORBIT_curptr += 4;
+	 body = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr += sizeof(body[_ORBIT_tmpvar_2]) * _ORBIT_tmpvar_3;
+      }
+   }
+   _impl_set_body_text(_ORBIT_servant, body, ev);
+   {				/* marshalling */
+      register GIOPSendBuffer *_ORBIT_send_buffer;
+
+      _ORBIT_send_buffer =
+	 giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->
+				    connection, NULL,
+				    _ORBIT_recv_buffer->message.u.request.
+				    request_id, ev->_major);
+      if (_ORBIT_send_buffer) {
+	 if (ev->_major == CORBA_NO_EXCEPTION) {
+	 } else
+	    ORBit_send_system_exception(_ORBIT_send_buffer, ev);
+	 giop_send_buffer_write(_ORBIT_send_buffer);
+	 giop_send_buffer_unuse(_ORBIT_send_buffer);
+      }
+   }
+}
+void
+_ORBIT_Evolution_Composer_CouldNotParse_marshal(GIOPSendBuffer *
+						_ORBIT_send_buffer,
+						CORBA_Environment * ev)
+{
+}
+void
+_ORBIT_skel_Evolution_Composer_attach_MIME(POA_Evolution_Composer *
+					   _ORBIT_servant,
+					   GIOPRecvBuffer *
+					   _ORBIT_recv_buffer,
+					   CORBA_Environment * ev,
+					   void (*_impl_attach_MIME)
+					   (PortableServer_Servant _servant,
+					    const CORBA_char * data,
+					    CORBA_Environment * ev))
+{
+   CORBA_char *data;
+
+   {				/* demarshalling */
+      guchar *_ORBIT_curptr;
+      register CORBA_unsigned_long _ORBIT_tmpvar_2;
+      CORBA_unsigned_long _ORBIT_tmpvar_3;
+
+      _ORBIT_curptr = GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur;
+      if (giop_msg_conversion_needed(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer))) {
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 
+	    (*((guint32 *) & (_ORBIT_tmpvar_3))) =
+	    GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	 _ORBIT_curptr += 4;
+	 data = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr += sizeof(data[_ORBIT_tmpvar_2]) * _ORBIT_tmpvar_3;
+      } else {
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 _ORBIT_tmpvar_3 = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	 _ORBIT_curptr += 4;
+	 data = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr += sizeof(data[_ORBIT_tmpvar_2]) * _ORBIT_tmpvar_3;
+      }
+   }
+   _impl_attach_MIME(_ORBIT_servant, data, ev);
+   {				/* marshalling */
+      register GIOPSendBuffer *_ORBIT_send_buffer;
+
+      _ORBIT_send_buffer =
+	 giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->
+				    connection, NULL,
+				    _ORBIT_recv_buffer->message.u.request.
+				    request_id, ev->_major);
+      if (_ORBIT_send_buffer) {
+	 if (ev->_major == CORBA_NO_EXCEPTION) {
+	 } else if (ev->_major == CORBA_USER_EXCEPTION) {
+	    static const ORBit_exception_marshal_info _ORBIT_user_exceptions[]
+	       = { {(const CORBA_TypeCode)
+		    &TC_Evolution_Composer_CouldNotParse_struct,
+		    (gpointer)
+		    _ORBIT_Evolution_Composer_CouldNotParse_marshal},
+	       {CORBA_OBJECT_NIL, NULL} };
+
+	    ORBit_send_user_exception(_ORBIT_send_buffer, ev,
+				      _ORBIT_user_exceptions);
+	 } else
+	    ORBit_send_system_exception(_ORBIT_send_buffer, ev);
+	 giop_send_buffer_write(_ORBIT_send_buffer);
+	 giop_send_buffer_unuse(_ORBIT_send_buffer);
+      }
+   }
+}
+void
+_ORBIT_skel_Evolution_Composer_attach_data(POA_Evolution_Composer *
+					   _ORBIT_servant,
+					   GIOPRecvBuffer *
+					   _ORBIT_recv_buffer,
+					   CORBA_Environment * ev,
+					   void (*_impl_attach_data)
+					   (PortableServer_Servant _servant,
+					    const CORBA_char * content_type,
+					    const CORBA_char * filename,
+					    const CORBA_char * description,
+					    const CORBA_boolean show_inline,
+					    const CORBA_char * data,
+					    CORBA_Environment * ev))
+{
+   CORBA_char *content_type;
+   CORBA_char *filename;
+   CORBA_char *description;
+   CORBA_boolean show_inline;
+   CORBA_char *data;
+
+   {				/* demarshalling */
+      guchar *_ORBIT_curptr;
+      register CORBA_unsigned_long _ORBIT_tmpvar_8;
+      CORBA_unsigned_long _ORBIT_tmpvar_9;
+      register CORBA_unsigned_long _ORBIT_tmpvar_10;
+      CORBA_unsigned_long _ORBIT_tmpvar_11;
+      register CORBA_unsigned_long _ORBIT_tmpvar_12;
+      CORBA_unsigned_long _ORBIT_tmpvar_13;
+      register CORBA_unsigned_long _ORBIT_tmpvar_14;
+      CORBA_unsigned_long _ORBIT_tmpvar_15;
+
+      _ORBIT_curptr = GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur;
+      if (giop_msg_conversion_needed(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer))) {
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 
+	    (*((guint32 *) & (_ORBIT_tmpvar_9))) =
+	    GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	 _ORBIT_curptr += 4;
+	 content_type = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr +=
+	    sizeof(content_type[_ORBIT_tmpvar_8]) * _ORBIT_tmpvar_9;
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 
+	    (*((guint32 *) & (_ORBIT_tmpvar_11))) =
+	    GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	 _ORBIT_curptr += 4;
+	 filename = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr +=
+	    sizeof(filename[_ORBIT_tmpvar_10]) * _ORBIT_tmpvar_11;
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 
+	    (*((guint32 *) & (_ORBIT_tmpvar_13))) =
+	    GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	 _ORBIT_curptr += 4;
+	 description = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr +=
+	    sizeof(description[_ORBIT_tmpvar_12]) * _ORBIT_tmpvar_13;
+	 show_inline = *((CORBA_boolean *) _ORBIT_curptr);
+	 _ORBIT_curptr += 1;
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 
+	    (*((guint32 *) & (_ORBIT_tmpvar_15))) =
+	    GUINT32_SWAP_LE_BE(*((guint32 *) _ORBIT_curptr));
+	 _ORBIT_curptr += 4;
+	 data = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr += sizeof(data[_ORBIT_tmpvar_14]) * _ORBIT_tmpvar_15;
+      } else {
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 _ORBIT_tmpvar_9 = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	 _ORBIT_curptr += 4;
+	 content_type = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr +=
+	    sizeof(content_type[_ORBIT_tmpvar_8]) * _ORBIT_tmpvar_9;
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 _ORBIT_tmpvar_11 = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	 _ORBIT_curptr += 4;
+	 filename = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr +=
+	    sizeof(filename[_ORBIT_tmpvar_10]) * _ORBIT_tmpvar_11;
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 _ORBIT_tmpvar_13 = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	 _ORBIT_curptr += 4;
+	 description = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr +=
+	    sizeof(description[_ORBIT_tmpvar_12]) * _ORBIT_tmpvar_13;
+	 show_inline = *((CORBA_boolean *) _ORBIT_curptr);
+	 _ORBIT_curptr += 1;
+	 _ORBIT_curptr = ALIGN_ADDRESS(_ORBIT_curptr, 4);
+	 _ORBIT_tmpvar_15 = *((CORBA_unsigned_long *) _ORBIT_curptr);
+	 _ORBIT_curptr += 4;
+	 data = (void *) _ORBIT_curptr;
+	 _ORBIT_curptr += sizeof(data[_ORBIT_tmpvar_14]) * _ORBIT_tmpvar_15;
+      }
+   }
+   _impl_attach_data(_ORBIT_servant, content_type, filename, description,
+		     show_inline, data, ev);
+   {				/* marshalling */
+      register GIOPSendBuffer *_ORBIT_send_buffer;
+
+      _ORBIT_send_buffer =
+	 giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->
+				    connection, NULL,
+				    _ORBIT_recv_buffer->message.u.request.
+				    request_id, ev->_major);
+      if (_ORBIT_send_buffer) {
+	 if (ev->_major == CORBA_NO_EXCEPTION) {
+	 } else
+	    ORBit_send_system_exception(_ORBIT_send_buffer, ev);
+	 giop_send_buffer_write(_ORBIT_send_buffer);
+	 giop_send_buffer_unuse(_ORBIT_send_buffer);
+      }
+   }
+}
+void
+_ORBIT_skel_Evolution_Composer_show(POA_Evolution_Composer * _ORBIT_servant,
+				    GIOPRecvBuffer * _ORBIT_recv_buffer,
+				    CORBA_Environment * ev,
+				    void (*_impl_show) (PortableServer_Servant
+							_servant,
+							CORBA_Environment *
+							ev))
+{
+   _impl_show(_ORBIT_servant, ev);
+   {				/* marshalling */
+      register GIOPSendBuffer *_ORBIT_send_buffer;
+
+      _ORBIT_send_buffer =
+	 giop_send_reply_buffer_use(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer)->
+				    connection, NULL,
+				    _ORBIT_recv_buffer->message.u.request.
+				    request_id, ev->_major);
+      if (_ORBIT_send_buffer) {
+	 if (ev->_major == CORBA_NO_EXCEPTION) {
+	 } else
+	    ORBit_send_system_exception(_ORBIT_send_buffer, ev);
+	 giop_send_buffer_write(_ORBIT_send_buffer);
+	 giop_send_buffer_unuse(_ORBIT_send_buffer);
+      }
+   }
+}
+static ORBitSkeleton
+get_skel_Evolution_Composer(POA_Evolution_Composer * servant,
+			    GIOPRecvBuffer * _ORBIT_recv_buffer,
+			    gpointer * impl)
+{
+   gchar *opname = _ORBIT_recv_buffer->message.u.request.operation;
+
+   switch (opname[0]) {
+     case 'a':
+	switch (opname[1]) {
+	  case 't':
+	     switch (opname[2]) {
+	       case 't':
+		  switch (opname[3]) {
+		    case 'a':
+		       switch (opname[4]) {
+			 case 'c':
+			    switch (opname[5]) {
+			      case 'h':
+				 switch (opname[6]) {
+				   case '_':
+				      switch (opname[7]) {
+					case 'M':
+					   if (strcmp((opname + 8), "IME"))
+					      break;
+					   *impl =
+					      (gpointer) servant->vepv->
+					      Evolution_Composer_epv->
+					      attach_MIME;
+					   return (ORBitSkeleton)
+					      _ORBIT_skel_Evolution_Composer_attach_MIME;
+					   break;
+					case 'd':
+					   if (strcmp((opname + 8), "ata"))
+					      break;
+					   *impl =
+					      (gpointer) servant->vepv->
+					      Evolution_Composer_epv->
+					      attach_data;
+					   return (ORBitSkeleton)
+					      _ORBIT_skel_Evolution_Composer_attach_data;
+					   break;
+					default:
+					   break;
+				      }
+				      break;
+				   default:
+				      break;
+				 }
+				 break;
+			      default:
+				 break;
+			    }
+			    break;
+			 default:
+			    break;
+		       }
+		       break;
+		    default:
+		       break;
+		  }
+		  break;
+	       default:
+		  break;
+	     }
+	     break;
+	  default:
+	     break;
+	}
+	break;
+     case 'q':
+	if (strcmp((opname + 1), "uery_interface"))
+	   break;
+	*impl = (gpointer) servant->vepv->Bonobo_Unknown_epv->query_interface;
+	return (ORBitSkeleton) _ORBIT_skel_Bonobo_Unknown_query_interface;
+	break;
+     case 'r':
+	if (strcmp((opname + 1), "ef"))
+	   break;
+	*impl = (gpointer) servant->vepv->Bonobo_Unknown_epv->ref;
+	return (ORBitSkeleton) _ORBIT_skel_Bonobo_Unknown_ref;
+	break;
+     case 's':
+	switch (opname[1]) {
+	  case 'e':
+	     switch (opname[2]) {
+	       case 't':
+		  switch (opname[3]) {
+		    case '_':
+		       switch (opname[4]) {
+			 case 'b':
+			    if (strcmp((opname + 5), "ody_text"))
+			       break;
+			    *impl =
+			       (gpointer) servant->vepv->
+			       Evolution_Composer_epv->set_body_text;
+			    return (ORBitSkeleton)
+			       _ORBIT_skel_Evolution_Composer_set_body_text;
+			    break;
+			 case 'h':
+			    if (strcmp((opname + 5), "eaders"))
+			       break;
+			    *impl =
+			       (gpointer) servant->vepv->
+			       Evolution_Composer_epv->set_headers;
+			    return (ORBitSkeleton)
+			       _ORBIT_skel_Evolution_Composer_set_headers;
+			    break;
+			 default:
+			    break;
+		       }
+		       break;
+		    default:
+		       break;
+		  }
+		  break;
+	       default:
+		  break;
+	     }
+	     break;
+	  case 'h':
+	     if (strcmp((opname + 2), "ow"))
+		break;
+	     *impl = (gpointer) servant->vepv->Evolution_Composer_epv->show;
+	     return (ORBitSkeleton) _ORBIT_skel_Evolution_Composer_show;
+	     break;
+	  default:
+	     break;
+	}
+	break;
+     case 'u':
+	if (strcmp((opname + 1), "nref"))
+	   break;
+	*impl = (gpointer) servant->vepv->Bonobo_Unknown_epv->unref;
+	return (ORBitSkeleton) _ORBIT_skel_Bonobo_Unknown_unref;
+	break;
+     default:
+	break;
+   }
+   return NULL;
+}
+
+static void
+init_local_objref_Evolution_Composer(CORBA_Object obj,
+				     POA_Evolution_Composer * servant)
+{
+   obj->vepv[Bonobo_Unknown__classid] = servant->vepv->Bonobo_Unknown_epv;
+   obj->vepv[Evolution_Composer__classid] =
+      servant->vepv->Evolution_Composer_epv;
+}
+
+void
+POA_Evolution_Composer__init(PortableServer_Servant servant,
+			     CORBA_Environment * env)
+{
+   static const PortableServer_ClassInfo class_info =
+      { (ORBit_impl_finder) & get_skel_Evolution_Composer,
+	 "IDL:Evolution/Composer:1.0",
+	 (ORBit_local_objref_init) & init_local_objref_Evolution_Composer };
+
+   PortableServer_ServantBase__init(((PortableServer_ServantBase *) servant),
+				    env);
+   POA_Bonobo_Unknown__init(servant, env);
+   ORBIT_OBJECT_KEY(((PortableServer_ServantBase *) servant)->_private)->
+      class_info = (PortableServer_ClassInfo *) & class_info;
+   if (!Evolution_Composer__classid)
+      Evolution_Composer__classid = ORBit_register_class(&class_info);
+}
+
+void
+POA_Evolution_Composer__fini(PortableServer_Servant servant,
+			     CORBA_Environment * env)
+{
+   POA_Bonobo_Unknown__fini(servant, env);
+   PortableServer_ServantBase__fini(servant, env);
+}
diff --git a/calendar/gui/Evolution-Composer-stubs.c b/calendar/gui/Evolution-Composer-stubs.c
new file mode 100644
index 0000000000..e60990c31e
--- /dev/null
+++ b/calendar/gui/Evolution-Composer-stubs.c
@@ -0,0 +1,846 @@
+/*
+ * This file was generated by orbit-idl - DO NOT EDIT!
+ */
+
+#include <string.h>
+#include "Evolution-Composer.h"
+
+void
+Evolution_Composer_set_headers(Evolution_Composer _obj,
+			       const Evolution_Composer_RecipientList * to,
+			       const Evolution_Composer_RecipientList * cc,
+			       const Evolution_Composer_RecipientList * bcc,
+			       const CORBA_char * subject,
+			       CORBA_Environment * ev)
+{
+   register GIOP_unsigned_long _ORBIT_request_id,
+    _ORBIT_system_exception_minor;
+   register CORBA_completion_status _ORBIT_completion_status;
+   register GIOPSendBuffer *_ORBIT_send_buffer;
+   register GIOPRecvBuffer *_ORBIT_recv_buffer;
+   register GIOPConnection *_cnx;
+
+   if (_obj->servant && _obj->vepv && Evolution_Composer__classid) {
+      
+	 ((POA_Evolution_Composer__epv *) _obj->
+       vepv[Evolution_Composer__classid])->set_headers(_obj->servant, to, cc,
+						       bcc, subject, ev);
+      return;
+   }
+   _cnx = ORBit_object_get_connection(_obj);
+ _ORBIT_retry_request:
+   _ORBIT_send_buffer = NULL;
+   _ORBIT_recv_buffer = NULL;
+   _ORBIT_completion_status = CORBA_COMPLETED_NO;
+   _ORBIT_request_id = GPOINTER_TO_UINT(alloca(0));
+   {				/* marshalling */
+      static const struct
+      {
+	 CORBA_unsigned_long len;
+	 char opname[12];
+      }
+      _ORBIT_operation_name_data =
+      {
+      12, "set_headers"};
+      static const struct iovec _ORBIT_operation_vec =
+	 { (gpointer) & _ORBIT_operation_name_data, 16 };
+      register CORBA_unsigned_long _ORBIT_tmpvar_0;
+      register CORBA_unsigned_long _ORBIT_tmpvar_1;
+      CORBA_unsigned_long _ORBIT_tmpvar_2;
+      register CORBA_unsigned_long _ORBIT_tmpvar_3;
+      CORBA_unsigned_long _ORBIT_tmpvar_4;
+      register CORBA_unsigned_long _ORBIT_tmpvar_5;
+      register CORBA_unsigned_long _ORBIT_tmpvar_6;
+      CORBA_unsigned_long _ORBIT_tmpvar_7;
+      register CORBA_unsigned_long _ORBIT_tmpvar_8;
+      CORBA_unsigned_long _ORBIT_tmpvar_9;
+      register CORBA_unsigned_long _ORBIT_tmpvar_10;
+      register CORBA_unsigned_long _ORBIT_tmpvar_11;
+      CORBA_unsigned_long _ORBIT_tmpvar_12;
+      register CORBA_unsigned_long _ORBIT_tmpvar_13;
+      CORBA_unsigned_long _ORBIT_tmpvar_14;
+      register CORBA_unsigned_long _ORBIT_tmpvar_15;
+      CORBA_unsigned_long _ORBIT_tmpvar_16;
+
+      _ORBIT_send_buffer =
+	 giop_send_request_buffer_use(_cnx, NULL, _ORBIT_request_id,
+				      CORBA_TRUE,
+				      &(_obj->active_profile->object_key_vec),
+				      &_ORBIT_operation_vec,
+				      &ORBit_default_principal_iovec);
+
+      _ORBIT_system_exception_minor = ex_CORBA_COMM_FAILURE;
+      if (!_ORBIT_send_buffer)
+	 goto _ORBIT_system_exception;
+      giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+				       (_ORBIT_send_buffer), 4);
+      {
+	 guchar *_ORBIT_t;
+
+	 _ORBIT_t = alloca(sizeof((*to)._length));
+	 memcpy(_ORBIT_t, &((*to)._length), sizeof((*to)._length));
+	 giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					(_ORBIT_send_buffer), (_ORBIT_t),
+					sizeof((*to)._length));
+      }
+      for (_ORBIT_tmpvar_0 = 0; _ORBIT_tmpvar_0 < (*to)._length;
+	   _ORBIT_tmpvar_0++) {
+	 _ORBIT_tmpvar_2 = strlen((*to)._buffer[_ORBIT_tmpvar_0].name) + 1;
+	 giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+					  (_ORBIT_send_buffer), 4);
+	 {
+	    guchar *_ORBIT_t;
+
+	    _ORBIT_t = alloca(sizeof(_ORBIT_tmpvar_2));
+	    memcpy(_ORBIT_t, &(_ORBIT_tmpvar_2), sizeof(_ORBIT_tmpvar_2));
+	    giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					   (_ORBIT_send_buffer), (_ORBIT_t),
+					   sizeof(_ORBIT_tmpvar_2));
+	 }
+	 {
+	    guchar *_ORBIT_t;
+
+	    _ORBIT_t =
+	       alloca(sizeof
+		      ((*to)._buffer[_ORBIT_tmpvar_0].name[_ORBIT_tmpvar_1]) *
+		      _ORBIT_tmpvar_2);
+	       memcpy(_ORBIT_t, ((*to)._buffer[_ORBIT_tmpvar_0].name),
+		      sizeof((*to)._buffer[_ORBIT_tmpvar_0].
+			     name[_ORBIT_tmpvar_1]) * _ORBIT_tmpvar_2);
+	    giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					   (_ORBIT_send_buffer), (_ORBIT_t),
+					   sizeof((*to).
+						  _buffer[_ORBIT_tmpvar_0].
+						  name[_ORBIT_tmpvar_1]) *
+					   _ORBIT_tmpvar_2);
+	 }
+	 _ORBIT_tmpvar_4 = strlen((*to)._buffer[_ORBIT_tmpvar_0].address) + 1;
+	 giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+					  (_ORBIT_send_buffer), 4);
+	 {
+	    guchar *_ORBIT_t;
+
+	    _ORBIT_t = alloca(sizeof(_ORBIT_tmpvar_4));
+	    memcpy(_ORBIT_t, &(_ORBIT_tmpvar_4), sizeof(_ORBIT_tmpvar_4));
+	    giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					   (_ORBIT_send_buffer), (_ORBIT_t),
+					   sizeof(_ORBIT_tmpvar_4));
+	 }
+	 {
+	    guchar *_ORBIT_t;
+
+	    _ORBIT_t =
+	       alloca(sizeof
+		      ((*to)._buffer[_ORBIT_tmpvar_0].
+		       address[_ORBIT_tmpvar_3]) * _ORBIT_tmpvar_4);
+	       memcpy(_ORBIT_t, ((*to)._buffer[_ORBIT_tmpvar_0].address),
+		      sizeof((*to)._buffer[_ORBIT_tmpvar_0].
+			     address[_ORBIT_tmpvar_3]) * _ORBIT_tmpvar_4);
+	    giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					   (_ORBIT_send_buffer), (_ORBIT_t),
+					   sizeof((*to).
+						  _buffer[_ORBIT_tmpvar_0].
+						  address[_ORBIT_tmpvar_3]) *
+					   _ORBIT_tmpvar_4);
+	 }
+      }
+
+      giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+				       (_ORBIT_send_buffer), 4);
+      {
+	 guchar *_ORBIT_t;
+
+	 _ORBIT_t = alloca(sizeof((*cc)._length));
+	 memcpy(_ORBIT_t, &((*cc)._length), sizeof((*cc)._length));
+	 giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					(_ORBIT_send_buffer), (_ORBIT_t),
+					sizeof((*cc)._length));
+      }
+      for (_ORBIT_tmpvar_5 = 0; _ORBIT_tmpvar_5 < (*cc)._length;
+	   _ORBIT_tmpvar_5++) {
+	 _ORBIT_tmpvar_7 = strlen((*cc)._buffer[_ORBIT_tmpvar_5].name) + 1;
+	 giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+					  (_ORBIT_send_buffer), 4);
+	 {
+	    guchar *_ORBIT_t;
+
+	    _ORBIT_t = alloca(sizeof(_ORBIT_tmpvar_7));
+	    memcpy(_ORBIT_t, &(_ORBIT_tmpvar_7), sizeof(_ORBIT_tmpvar_7));
+	    giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					   (_ORBIT_send_buffer), (_ORBIT_t),
+					   sizeof(_ORBIT_tmpvar_7));
+	 }
+	 {
+	    guchar *_ORBIT_t;
+
+	    _ORBIT_t =
+	       alloca(sizeof
+		      ((*cc)._buffer[_ORBIT_tmpvar_5].name[_ORBIT_tmpvar_6]) *
+		      _ORBIT_tmpvar_7);
+	       memcpy(_ORBIT_t, ((*cc)._buffer[_ORBIT_tmpvar_5].name),
+		      sizeof((*cc)._buffer[_ORBIT_tmpvar_5].
+			     name[_ORBIT_tmpvar_6]) * _ORBIT_tmpvar_7);
+	    giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					   (_ORBIT_send_buffer), (_ORBIT_t),
+					   sizeof((*cc).
+						  _buffer[_ORBIT_tmpvar_5].
+						  name[_ORBIT_tmpvar_6]) *
+					   _ORBIT_tmpvar_7);
+	 }
+	 _ORBIT_tmpvar_9 = strlen((*cc)._buffer[_ORBIT_tmpvar_5].address) + 1;
+	 giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+					  (_ORBIT_send_buffer), 4);
+	 {
+	    guchar *_ORBIT_t;
+
+	    _ORBIT_t = alloca(sizeof(_ORBIT_tmpvar_9));
+	    memcpy(_ORBIT_t, &(_ORBIT_tmpvar_9), sizeof(_ORBIT_tmpvar_9));
+	    giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					   (_ORBIT_send_buffer), (_ORBIT_t),
+					   sizeof(_ORBIT_tmpvar_9));
+	 }
+	 {
+	    guchar *_ORBIT_t;
+
+	    _ORBIT_t =
+	       alloca(sizeof
+		      ((*cc)._buffer[_ORBIT_tmpvar_5].
+		       address[_ORBIT_tmpvar_8]) * _ORBIT_tmpvar_9);
+	       memcpy(_ORBIT_t, ((*cc)._buffer[_ORBIT_tmpvar_5].address),
+		      sizeof((*cc)._buffer[_ORBIT_tmpvar_5].
+			     address[_ORBIT_tmpvar_8]) * _ORBIT_tmpvar_9);
+	    giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					   (_ORBIT_send_buffer), (_ORBIT_t),
+					   sizeof((*cc).
+						  _buffer[_ORBIT_tmpvar_5].
+						  address[_ORBIT_tmpvar_8]) *
+					   _ORBIT_tmpvar_9);
+	 }
+      }
+
+      giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+				       (_ORBIT_send_buffer), 4);
+      {
+	 guchar *_ORBIT_t;
+
+	 _ORBIT_t = alloca(sizeof((*bcc)._length));
+	 memcpy(_ORBIT_t, &((*bcc)._length), sizeof((*bcc)._length));
+	 giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					(_ORBIT_send_buffer), (_ORBIT_t),
+					sizeof((*bcc)._length));
+      }
+      for (_ORBIT_tmpvar_10 = 0; _ORBIT_tmpvar_10 < (*bcc)._length;
+	   _ORBIT_tmpvar_10++) {
+	 _ORBIT_tmpvar_12 = strlen((*bcc)._buffer[_ORBIT_tmpvar_10].name) + 1;
+	 giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+					  (_ORBIT_send_buffer), 4);
+	 {
+	    guchar *_ORBIT_t;
+
+	    _ORBIT_t = alloca(sizeof(_ORBIT_tmpvar_12));
+	    memcpy(_ORBIT_t, &(_ORBIT_tmpvar_12), sizeof(_ORBIT_tmpvar_12));
+	    giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					   (_ORBIT_send_buffer), (_ORBIT_t),
+					   sizeof(_ORBIT_tmpvar_12));
+	 }
+	 {
+	    guchar *_ORBIT_t;
+
+	    _ORBIT_t =
+	       alloca(sizeof
+		      ((*bcc)._buffer[_ORBIT_tmpvar_10].
+		       name[_ORBIT_tmpvar_11]) * _ORBIT_tmpvar_12);
+	       memcpy(_ORBIT_t, ((*bcc)._buffer[_ORBIT_tmpvar_10].name),
+		      sizeof((*bcc)._buffer[_ORBIT_tmpvar_10].
+			     name[_ORBIT_tmpvar_11]) * _ORBIT_tmpvar_12);
+	    giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					   (_ORBIT_send_buffer), (_ORBIT_t),
+					   sizeof((*bcc).
+						  _buffer[_ORBIT_tmpvar_10].
+						  name[_ORBIT_tmpvar_11]) *
+					   _ORBIT_tmpvar_12);
+	 }
+	 _ORBIT_tmpvar_14 =
+	    strlen((*bcc)._buffer[_ORBIT_tmpvar_10].address) + 1;
+	 giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+					  (_ORBIT_send_buffer), 4);
+	 {
+	    guchar *_ORBIT_t;
+
+	    _ORBIT_t = alloca(sizeof(_ORBIT_tmpvar_14));
+	    memcpy(_ORBIT_t, &(_ORBIT_tmpvar_14), sizeof(_ORBIT_tmpvar_14));
+	    giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					   (_ORBIT_send_buffer), (_ORBIT_t),
+					   sizeof(_ORBIT_tmpvar_14));
+	 }
+	 {
+	    guchar *_ORBIT_t;
+
+	    _ORBIT_t =
+	       alloca(sizeof
+		      ((*bcc)._buffer[_ORBIT_tmpvar_10].
+		       address[_ORBIT_tmpvar_13]) * _ORBIT_tmpvar_14);
+	       memcpy(_ORBIT_t, ((*bcc)._buffer[_ORBIT_tmpvar_10].address),
+		      sizeof((*bcc)._buffer[_ORBIT_tmpvar_10].
+			     address[_ORBIT_tmpvar_13]) * _ORBIT_tmpvar_14);
+	    giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					   (_ORBIT_send_buffer), (_ORBIT_t),
+					   sizeof((*bcc).
+						  _buffer[_ORBIT_tmpvar_10].
+						  address[_ORBIT_tmpvar_13]) *
+					   _ORBIT_tmpvar_14);
+	 }
+      }
+
+      _ORBIT_tmpvar_16 = strlen(subject) + 1;
+      giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+				       (_ORBIT_send_buffer), 4);
+      {
+	 guchar *_ORBIT_t;
+
+	 _ORBIT_t = alloca(sizeof(_ORBIT_tmpvar_16));
+	 memcpy(_ORBIT_t, &(_ORBIT_tmpvar_16), sizeof(_ORBIT_tmpvar_16));
+	 giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					(_ORBIT_send_buffer), (_ORBIT_t),
+					sizeof(_ORBIT_tmpvar_16));
+      }
+      giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer),
+				     (subject),
+				     sizeof(subject[_ORBIT_tmpvar_15]) *
+				     _ORBIT_tmpvar_16);
+      giop_send_buffer_write(_ORBIT_send_buffer);
+      _ORBIT_completion_status = CORBA_COMPLETED_MAYBE;
+      giop_send_buffer_unuse(_ORBIT_send_buffer);
+      _ORBIT_send_buffer = NULL;
+   }
+   {				/* demarshalling */
+      register guchar *_ORBIT_curptr;
+
+      _ORBIT_recv_buffer =
+	 giop_recv_reply_buffer_use_2(_cnx, _ORBIT_request_id, TRUE);
+      if (!_ORBIT_recv_buffer)
+	 goto _ORBIT_system_exception;
+      _ORBIT_completion_status = CORBA_COMPLETED_YES;
+      if (_ORBIT_recv_buffer->message.u.reply.reply_status !=
+	  GIOP_NO_EXCEPTION) goto _ORBIT_msg_exception;
+      _ORBIT_curptr = GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur;
+      if (giop_msg_conversion_needed(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer))) {
+      } else {
+      }
+      giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+      return;
+    _ORBIT_system_exception:
+      CORBA_exception_set_system(ev, _ORBIT_system_exception_minor,
+				 _ORBIT_completion_status);
+      giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+      giop_send_buffer_unuse(_ORBIT_send_buffer);
+      return;
+    _ORBIT_msg_exception:
+      if (_ORBIT_recv_buffer->message.u.reply.reply_status ==
+	  GIOP_LOCATION_FORWARD) {
+	 if (_obj->forward_locations != NULL)
+	    ORBit_delete_profiles(_obj->forward_locations);
+	 _obj->forward_locations = ORBit_demarshal_IOR(_ORBIT_recv_buffer);
+	 _cnx = ORBit_object_get_forwarded_connection(_obj);
+	 giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+
+	 goto _ORBIT_retry_request;
+      } else {
+	 ORBit_handle_exception(_ORBIT_recv_buffer, ev, NULL, _obj->orb);
+	 giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+	 return;
+      }
+   }
+}
+void
+Evolution_Composer_set_body_text(Evolution_Composer _obj,
+				 const CORBA_char * body,
+				 CORBA_Environment * ev)
+{
+   register GIOP_unsigned_long _ORBIT_request_id,
+    _ORBIT_system_exception_minor;
+   register CORBA_completion_status _ORBIT_completion_status;
+   register GIOPSendBuffer *_ORBIT_send_buffer;
+   register GIOPRecvBuffer *_ORBIT_recv_buffer;
+   register GIOPConnection *_cnx;
+
+   if (_obj->servant && _obj->vepv && Evolution_Composer__classid) {
+      
+	 ((POA_Evolution_Composer__epv *) _obj->
+       vepv[Evolution_Composer__classid])->set_body_text(_obj->servant, body,
+							 ev);
+      return;
+   }
+   _cnx = ORBit_object_get_connection(_obj);
+ _ORBIT_retry_request:
+   _ORBIT_send_buffer = NULL;
+   _ORBIT_recv_buffer = NULL;
+   _ORBIT_completion_status = CORBA_COMPLETED_NO;
+   _ORBIT_request_id = GPOINTER_TO_UINT(alloca(0));
+   {				/* marshalling */
+      static const struct
+      {
+	 CORBA_unsigned_long len;
+	 char opname[14];
+      }
+      _ORBIT_operation_name_data =
+      {
+      14, "set_body_text"};
+      static const struct iovec _ORBIT_operation_vec =
+	 { (gpointer) & _ORBIT_operation_name_data, 18 };
+      register CORBA_unsigned_long _ORBIT_tmpvar_0;
+      CORBA_unsigned_long _ORBIT_tmpvar_1;
+
+      _ORBIT_send_buffer =
+	 giop_send_request_buffer_use(_cnx, NULL, _ORBIT_request_id,
+				      CORBA_TRUE,
+				      &(_obj->active_profile->object_key_vec),
+				      &_ORBIT_operation_vec,
+				      &ORBit_default_principal_iovec);
+
+      _ORBIT_system_exception_minor = ex_CORBA_COMM_FAILURE;
+      if (!_ORBIT_send_buffer)
+	 goto _ORBIT_system_exception;
+      _ORBIT_tmpvar_1 = strlen(body) + 1;
+      giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+				       (_ORBIT_send_buffer), 4);
+      {
+	 guchar *_ORBIT_t;
+
+	 _ORBIT_t = alloca(sizeof(_ORBIT_tmpvar_1));
+	 memcpy(_ORBIT_t, &(_ORBIT_tmpvar_1), sizeof(_ORBIT_tmpvar_1));
+	 giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					(_ORBIT_send_buffer), (_ORBIT_t),
+					sizeof(_ORBIT_tmpvar_1));
+      }
+      giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer),
+				     (body),
+				     sizeof(body[_ORBIT_tmpvar_0]) *
+				     _ORBIT_tmpvar_1);
+      giop_send_buffer_write(_ORBIT_send_buffer);
+      _ORBIT_completion_status = CORBA_COMPLETED_MAYBE;
+      giop_send_buffer_unuse(_ORBIT_send_buffer);
+      _ORBIT_send_buffer = NULL;
+   }
+   {				/* demarshalling */
+      register guchar *_ORBIT_curptr;
+
+      _ORBIT_recv_buffer =
+	 giop_recv_reply_buffer_use_2(_cnx, _ORBIT_request_id, TRUE);
+      if (!_ORBIT_recv_buffer)
+	 goto _ORBIT_system_exception;
+      _ORBIT_completion_status = CORBA_COMPLETED_YES;
+      if (_ORBIT_recv_buffer->message.u.reply.reply_status !=
+	  GIOP_NO_EXCEPTION) goto _ORBIT_msg_exception;
+      _ORBIT_curptr = GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur;
+      if (giop_msg_conversion_needed(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer))) {
+      } else {
+      }
+      giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+      return;
+    _ORBIT_system_exception:
+      CORBA_exception_set_system(ev, _ORBIT_system_exception_minor,
+				 _ORBIT_completion_status);
+      giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+      giop_send_buffer_unuse(_ORBIT_send_buffer);
+      return;
+    _ORBIT_msg_exception:
+      if (_ORBIT_recv_buffer->message.u.reply.reply_status ==
+	  GIOP_LOCATION_FORWARD) {
+	 if (_obj->forward_locations != NULL)
+	    ORBit_delete_profiles(_obj->forward_locations);
+	 _obj->forward_locations = ORBit_demarshal_IOR(_ORBIT_recv_buffer);
+	 _cnx = ORBit_object_get_forwarded_connection(_obj);
+	 giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+
+	 goto _ORBIT_retry_request;
+      } else {
+	 ORBit_handle_exception(_ORBIT_recv_buffer, ev, NULL, _obj->orb);
+	 giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+	 return;
+      }
+   }
+}
+void
+_ORBIT_Evolution_Composer_CouldNotParse_demarshal(GIOPRecvBuffer *
+						  _ORBIT_recv_buffer,
+						  CORBA_Environment * ev)
+{
+   CORBA_exception_set(ev, CORBA_USER_EXCEPTION,
+		       TC_Evolution_Composer_CouldNotParse_struct.repo_id,
+		       NULL);
+}
+
+void
+Evolution_Composer_attach_MIME(Evolution_Composer _obj,
+			       const CORBA_char * data,
+			       CORBA_Environment * ev)
+{
+   static const ORBit_exception_demarshal_info _ORBIT_user_exceptions[] =
+      { {(const CORBA_TypeCode) &TC_Evolution_Composer_CouldNotParse_struct,
+	 (gpointer) _ORBIT_Evolution_Composer_CouldNotParse_demarshal},
+      {CORBA_OBJECT_NIL, NULL} };
+   register GIOP_unsigned_long _ORBIT_request_id,
+    _ORBIT_system_exception_minor;
+   register CORBA_completion_status _ORBIT_completion_status;
+   register GIOPSendBuffer *_ORBIT_send_buffer;
+   register GIOPRecvBuffer *_ORBIT_recv_buffer;
+   register GIOPConnection *_cnx;
+
+   if (_obj->servant && _obj->vepv && Evolution_Composer__classid) {
+      
+	 ((POA_Evolution_Composer__epv *) _obj->
+       vepv[Evolution_Composer__classid])->attach_MIME(_obj->servant, data,
+						       ev);
+      return;
+   }
+   _cnx = ORBit_object_get_connection(_obj);
+ _ORBIT_retry_request:
+   _ORBIT_send_buffer = NULL;
+   _ORBIT_recv_buffer = NULL;
+   _ORBIT_completion_status = CORBA_COMPLETED_NO;
+   _ORBIT_request_id = GPOINTER_TO_UINT(alloca(0));
+   {				/* marshalling */
+      static const struct
+      {
+	 CORBA_unsigned_long len;
+	 char opname[12];
+      }
+      _ORBIT_operation_name_data =
+      {
+      12, "attach_MIME"};
+      static const struct iovec _ORBIT_operation_vec =
+	 { (gpointer) & _ORBIT_operation_name_data, 16 };
+      register CORBA_unsigned_long _ORBIT_tmpvar_0;
+      CORBA_unsigned_long _ORBIT_tmpvar_1;
+
+      _ORBIT_send_buffer =
+	 giop_send_request_buffer_use(_cnx, NULL, _ORBIT_request_id,
+				      CORBA_TRUE,
+				      &(_obj->active_profile->object_key_vec),
+				      &_ORBIT_operation_vec,
+				      &ORBit_default_principal_iovec);
+
+      _ORBIT_system_exception_minor = ex_CORBA_COMM_FAILURE;
+      if (!_ORBIT_send_buffer)
+	 goto _ORBIT_system_exception;
+      _ORBIT_tmpvar_1 = strlen(data) + 1;
+      giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+				       (_ORBIT_send_buffer), 4);
+      {
+	 guchar *_ORBIT_t;
+
+	 _ORBIT_t = alloca(sizeof(_ORBIT_tmpvar_1));
+	 memcpy(_ORBIT_t, &(_ORBIT_tmpvar_1), sizeof(_ORBIT_tmpvar_1));
+	 giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					(_ORBIT_send_buffer), (_ORBIT_t),
+					sizeof(_ORBIT_tmpvar_1));
+      }
+      giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer),
+				     (data),
+				     sizeof(data[_ORBIT_tmpvar_0]) *
+				     _ORBIT_tmpvar_1);
+      giop_send_buffer_write(_ORBIT_send_buffer);
+      _ORBIT_completion_status = CORBA_COMPLETED_MAYBE;
+      giop_send_buffer_unuse(_ORBIT_send_buffer);
+      _ORBIT_send_buffer = NULL;
+   }
+   {				/* demarshalling */
+      register guchar *_ORBIT_curptr;
+
+      _ORBIT_recv_buffer =
+	 giop_recv_reply_buffer_use_2(_cnx, _ORBIT_request_id, TRUE);
+      if (!_ORBIT_recv_buffer)
+	 goto _ORBIT_system_exception;
+      _ORBIT_completion_status = CORBA_COMPLETED_YES;
+      if (_ORBIT_recv_buffer->message.u.reply.reply_status !=
+	  GIOP_NO_EXCEPTION) goto _ORBIT_msg_exception;
+      _ORBIT_curptr = GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur;
+      if (giop_msg_conversion_needed(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer))) {
+      } else {
+      }
+      giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+      return;
+    _ORBIT_system_exception:
+      CORBA_exception_set_system(ev, _ORBIT_system_exception_minor,
+				 _ORBIT_completion_status);
+      giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+      giop_send_buffer_unuse(_ORBIT_send_buffer);
+      return;
+    _ORBIT_msg_exception:
+      if (_ORBIT_recv_buffer->message.u.reply.reply_status ==
+	  GIOP_LOCATION_FORWARD) {
+	 if (_obj->forward_locations != NULL)
+	    ORBit_delete_profiles(_obj->forward_locations);
+	 _obj->forward_locations = ORBit_demarshal_IOR(_ORBIT_recv_buffer);
+	 _cnx = ORBit_object_get_forwarded_connection(_obj);
+	 giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+
+	 goto _ORBIT_retry_request;
+      } else {
+	 ORBit_handle_exception(_ORBIT_recv_buffer, ev,
+				_ORBIT_user_exceptions, _obj->orb);
+	 giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+	 return;
+      }
+   }
+}
+void
+Evolution_Composer_attach_data(Evolution_Composer _obj,
+			       const CORBA_char * content_type,
+			       const CORBA_char * filename,
+			       const CORBA_char * description,
+			       const CORBA_boolean show_inline,
+			       const CORBA_char * data,
+			       CORBA_Environment * ev)
+{
+   register GIOP_unsigned_long _ORBIT_request_id,
+    _ORBIT_system_exception_minor;
+   register CORBA_completion_status _ORBIT_completion_status;
+   register GIOPSendBuffer *_ORBIT_send_buffer;
+   register GIOPRecvBuffer *_ORBIT_recv_buffer;
+   register GIOPConnection *_cnx;
+
+   if (_obj->servant && _obj->vepv && Evolution_Composer__classid) {
+      
+	 ((POA_Evolution_Composer__epv *) _obj->
+       vepv[Evolution_Composer__classid])->attach_data(_obj->servant,
+						       content_type, filename,
+						       description,
+						       show_inline, data, ev);
+      return;
+   }
+   _cnx = ORBit_object_get_connection(_obj);
+ _ORBIT_retry_request:
+   _ORBIT_send_buffer = NULL;
+   _ORBIT_recv_buffer = NULL;
+   _ORBIT_completion_status = CORBA_COMPLETED_NO;
+   _ORBIT_request_id = GPOINTER_TO_UINT(alloca(0));
+   {				/* marshalling */
+      static const struct
+      {
+	 CORBA_unsigned_long len;
+	 char opname[12];
+      }
+      _ORBIT_operation_name_data =
+      {
+      12, "attach_data"};
+      static const struct iovec _ORBIT_operation_vec =
+	 { (gpointer) & _ORBIT_operation_name_data, 16 };
+      register CORBA_unsigned_long _ORBIT_tmpvar_0;
+      CORBA_unsigned_long _ORBIT_tmpvar_1;
+      register CORBA_unsigned_long _ORBIT_tmpvar_2;
+      CORBA_unsigned_long _ORBIT_tmpvar_3;
+      register CORBA_unsigned_long _ORBIT_tmpvar_4;
+      CORBA_unsigned_long _ORBIT_tmpvar_5;
+      register CORBA_unsigned_long _ORBIT_tmpvar_6;
+      CORBA_unsigned_long _ORBIT_tmpvar_7;
+
+      _ORBIT_send_buffer =
+	 giop_send_request_buffer_use(_cnx, NULL, _ORBIT_request_id,
+				      CORBA_TRUE,
+				      &(_obj->active_profile->object_key_vec),
+				      &_ORBIT_operation_vec,
+				      &ORBit_default_principal_iovec);
+
+      _ORBIT_system_exception_minor = ex_CORBA_COMM_FAILURE;
+      if (!_ORBIT_send_buffer)
+	 goto _ORBIT_system_exception;
+      _ORBIT_tmpvar_1 = strlen(content_type) + 1;
+      giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+				       (_ORBIT_send_buffer), 4);
+      {
+	 guchar *_ORBIT_t;
+
+	 _ORBIT_t = alloca(sizeof(_ORBIT_tmpvar_1));
+	 memcpy(_ORBIT_t, &(_ORBIT_tmpvar_1), sizeof(_ORBIT_tmpvar_1));
+	 giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					(_ORBIT_send_buffer), (_ORBIT_t),
+					sizeof(_ORBIT_tmpvar_1));
+      }
+      giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer),
+				     (content_type),
+				     sizeof(content_type[_ORBIT_tmpvar_0]) *
+				     _ORBIT_tmpvar_1);
+      _ORBIT_tmpvar_3 = strlen(filename) + 1;
+      giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+				       (_ORBIT_send_buffer), 4);
+      {
+	 guchar *_ORBIT_t;
+
+	 _ORBIT_t = alloca(sizeof(_ORBIT_tmpvar_3));
+	 memcpy(_ORBIT_t, &(_ORBIT_tmpvar_3), sizeof(_ORBIT_tmpvar_3));
+	 giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					(_ORBIT_send_buffer), (_ORBIT_t),
+					sizeof(_ORBIT_tmpvar_3));
+      }
+      giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer),
+				     (filename),
+				     sizeof(filename[_ORBIT_tmpvar_2]) *
+				     _ORBIT_tmpvar_3);
+      _ORBIT_tmpvar_5 = strlen(description) + 1;
+      giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+				       (_ORBIT_send_buffer), 4);
+      {
+	 guchar *_ORBIT_t;
+
+	 _ORBIT_t = alloca(sizeof(_ORBIT_tmpvar_5));
+	 memcpy(_ORBIT_t, &(_ORBIT_tmpvar_5), sizeof(_ORBIT_tmpvar_5));
+	 giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					(_ORBIT_send_buffer), (_ORBIT_t),
+					sizeof(_ORBIT_tmpvar_5));
+      }
+      giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer),
+				     (description),
+				     sizeof(description[_ORBIT_tmpvar_4]) *
+				     _ORBIT_tmpvar_5);
+      giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer),
+				     &(show_inline), sizeof(show_inline));
+      _ORBIT_tmpvar_7 = strlen(data) + 1;
+      giop_message_buffer_do_alignment(GIOP_MESSAGE_BUFFER
+				       (_ORBIT_send_buffer), 4);
+      {
+	 guchar *_ORBIT_t;
+
+	 _ORBIT_t = alloca(sizeof(_ORBIT_tmpvar_7));
+	 memcpy(_ORBIT_t, &(_ORBIT_tmpvar_7), sizeof(_ORBIT_tmpvar_7));
+	 giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER
+					(_ORBIT_send_buffer), (_ORBIT_t),
+					sizeof(_ORBIT_tmpvar_7));
+      }
+      giop_message_buffer_append_mem(GIOP_MESSAGE_BUFFER(_ORBIT_send_buffer),
+				     (data),
+				     sizeof(data[_ORBIT_tmpvar_6]) *
+				     _ORBIT_tmpvar_7);
+      giop_send_buffer_write(_ORBIT_send_buffer);
+      _ORBIT_completion_status = CORBA_COMPLETED_MAYBE;
+      giop_send_buffer_unuse(_ORBIT_send_buffer);
+      _ORBIT_send_buffer = NULL;
+   }
+   {				/* demarshalling */
+      register guchar *_ORBIT_curptr;
+
+      _ORBIT_recv_buffer =
+	 giop_recv_reply_buffer_use_2(_cnx, _ORBIT_request_id, TRUE);
+      if (!_ORBIT_recv_buffer)
+	 goto _ORBIT_system_exception;
+      _ORBIT_completion_status = CORBA_COMPLETED_YES;
+      if (_ORBIT_recv_buffer->message.u.reply.reply_status !=
+	  GIOP_NO_EXCEPTION) goto _ORBIT_msg_exception;
+      _ORBIT_curptr = GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur;
+      if (giop_msg_conversion_needed(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer))) {
+      } else {
+      }
+      giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+      return;
+    _ORBIT_system_exception:
+      CORBA_exception_set_system(ev, _ORBIT_system_exception_minor,
+				 _ORBIT_completion_status);
+      giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+      giop_send_buffer_unuse(_ORBIT_send_buffer);
+      return;
+    _ORBIT_msg_exception:
+      if (_ORBIT_recv_buffer->message.u.reply.reply_status ==
+	  GIOP_LOCATION_FORWARD) {
+	 if (_obj->forward_locations != NULL)
+	    ORBit_delete_profiles(_obj->forward_locations);
+	 _obj->forward_locations = ORBit_demarshal_IOR(_ORBIT_recv_buffer);
+	 _cnx = ORBit_object_get_forwarded_connection(_obj);
+	 giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+
+	 goto _ORBIT_retry_request;
+      } else {
+	 ORBit_handle_exception(_ORBIT_recv_buffer, ev, NULL, _obj->orb);
+	 giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+	 return;
+      }
+   }
+}
+void
+Evolution_Composer_show(Evolution_Composer _obj, CORBA_Environment * ev)
+{
+   register GIOP_unsigned_long _ORBIT_request_id,
+    _ORBIT_system_exception_minor;
+   register CORBA_completion_status _ORBIT_completion_status;
+   register GIOPSendBuffer *_ORBIT_send_buffer;
+   register GIOPRecvBuffer *_ORBIT_recv_buffer;
+   register GIOPConnection *_cnx;
+
+   if (_obj->servant && _obj->vepv && Evolution_Composer__classid) {
+      
+	 ((POA_Evolution_Composer__epv *) _obj->
+       vepv[Evolution_Composer__classid])->show(_obj->servant, ev);
+      return;
+   }
+   _cnx = ORBit_object_get_connection(_obj);
+ _ORBIT_retry_request:
+   _ORBIT_send_buffer = NULL;
+   _ORBIT_recv_buffer = NULL;
+   _ORBIT_completion_status = CORBA_COMPLETED_NO;
+   _ORBIT_request_id = GPOINTER_TO_UINT(alloca(0));
+   {				/* marshalling */
+      static const struct
+      {
+	 CORBA_unsigned_long len;
+	 char opname[5];
+      }
+      _ORBIT_operation_name_data =
+      {
+      5, "show"};
+      static const struct iovec _ORBIT_operation_vec =
+	 { (gpointer) & _ORBIT_operation_name_data, 9 };
+
+      _ORBIT_send_buffer =
+	 giop_send_request_buffer_use(_cnx, NULL, _ORBIT_request_id,
+				      CORBA_TRUE,
+				      &(_obj->active_profile->object_key_vec),
+				      &_ORBIT_operation_vec,
+				      &ORBit_default_principal_iovec);
+
+      _ORBIT_system_exception_minor = ex_CORBA_COMM_FAILURE;
+      if (!_ORBIT_send_buffer)
+	 goto _ORBIT_system_exception;
+      giop_send_buffer_write(_ORBIT_send_buffer);
+      _ORBIT_completion_status = CORBA_COMPLETED_MAYBE;
+      giop_send_buffer_unuse(_ORBIT_send_buffer);
+      _ORBIT_send_buffer = NULL;
+   }
+   {				/* demarshalling */
+      register guchar *_ORBIT_curptr;
+
+      _ORBIT_recv_buffer =
+	 giop_recv_reply_buffer_use_2(_cnx, _ORBIT_request_id, TRUE);
+      if (!_ORBIT_recv_buffer)
+	 goto _ORBIT_system_exception;
+      _ORBIT_completion_status = CORBA_COMPLETED_YES;
+      if (_ORBIT_recv_buffer->message.u.reply.reply_status !=
+	  GIOP_NO_EXCEPTION) goto _ORBIT_msg_exception;
+      _ORBIT_curptr = GIOP_RECV_BUFFER(_ORBIT_recv_buffer)->cur;
+      if (giop_msg_conversion_needed(GIOP_MESSAGE_BUFFER(_ORBIT_recv_buffer))) {
+      } else {
+      }
+      giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+      return;
+    _ORBIT_system_exception:
+      CORBA_exception_set_system(ev, _ORBIT_system_exception_minor,
+				 _ORBIT_completion_status);
+      giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+      giop_send_buffer_unuse(_ORBIT_send_buffer);
+      return;
+    _ORBIT_msg_exception:
+      if (_ORBIT_recv_buffer->message.u.reply.reply_status ==
+	  GIOP_LOCATION_FORWARD) {
+	 if (_obj->forward_locations != NULL)
+	    ORBit_delete_profiles(_obj->forward_locations);
+	 _obj->forward_locations = ORBit_demarshal_IOR(_ORBIT_recv_buffer);
+	 _cnx = ORBit_object_get_forwarded_connection(_obj);
+	 giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+
+	 goto _ORBIT_retry_request;
+      } else {
+	 ORBit_handle_exception(_ORBIT_recv_buffer, ev, NULL, _obj->orb);
+	 giop_recv_buffer_unuse(_ORBIT_recv_buffer);
+	 return;
+      }
+   }
+}
diff --git a/calendar/gui/Evolution-Composer.h b/calendar/gui/Evolution-Composer.h
new file mode 100644
index 0000000000..f99f5eca3e
--- /dev/null
+++ b/calendar/gui/Evolution-Composer.h
@@ -0,0 +1,369 @@
+/*
+ * This file was generated by orbit-idl - DO NOT EDIT!
+ */
+
+#include <glib.h>
+#define ORBIT_IDL_SERIAL 9
+#include <orb/orbit.h>
+
+#ifndef Evolution_Composer_H
+#define Evolution_Composer_H 1
+#ifdef __cplusplus
+extern "C"
+{
+#endif				/* __cplusplus */
+
+/** typedefs **/
+#include <bonobo/Bonobo.h>
+#if !defined(ORBIT_DECL_Evolution_Composer) && !defined(_Evolution_Composer_defined)
+#define ORBIT_DECL_Evolution_Composer 1
+#define _Evolution_Composer_defined 1
+#define Evolution_Composer__free CORBA_Object__free
+   typedef CORBA_Object Evolution_Composer;
+   extern CORBA_unsigned_long Evolution_Composer__classid;
+#if !defined(TC_IMPL_TC_Evolution_Composer_0)
+#define TC_IMPL_TC_Evolution_Composer_0 'E'
+#define TC_IMPL_TC_Evolution_Composer_1 'v'
+#define TC_IMPL_TC_Evolution_Composer_2 'o'
+#define TC_IMPL_TC_Evolution_Composer_3 'l'
+#define TC_IMPL_TC_Evolution_Composer_4 'u'
+#define TC_IMPL_TC_Evolution_Composer_5 't'
+#define TC_IMPL_TC_Evolution_Composer_6 'i'
+#define TC_IMPL_TC_Evolution_Composer_7 'o'
+#define TC_IMPL_TC_Evolution_Composer_8 'n'
+#define TC_IMPL_TC_Evolution_Composer_9 '_'
+#define TC_IMPL_TC_Evolution_Composer_10 'C'
+#define TC_IMPL_TC_Evolution_Composer_11 'o'
+#define TC_IMPL_TC_Evolution_Composer_12 'm'
+#define TC_IMPL_TC_Evolution_Composer_13 'p'
+#define TC_IMPL_TC_Evolution_Composer_14 'o'
+#define TC_IMPL_TC_Evolution_Composer_15 's'
+#define TC_IMPL_TC_Evolution_Composer_16 'e'
+#define TC_IMPL_TC_Evolution_Composer_17 'r'
+   extern const struct CORBA_TypeCode_struct TC_Evolution_Composer_struct;
+#define TC_Evolution_Composer ((CORBA_TypeCode)&TC_Evolution_Composer_struct)
+#endif
+#endif
+#if !defined(_Evolution_Composer_Recipient_defined)
+#define _Evolution_Composer_Recipient_defined 1
+   typedef struct
+   {
+      CORBA_char *name;
+      CORBA_char *address;
+   }
+   Evolution_Composer_Recipient;
+
+#if !defined(TC_IMPL_TC_Evolution_Composer_Recipient_0)
+#define TC_IMPL_TC_Evolution_Composer_Recipient_0 'E'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_1 'v'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_2 'o'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_3 'l'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_4 'u'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_5 't'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_6 'i'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_7 'o'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_8 'n'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_9 '_'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_10 'C'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_11 'o'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_12 'm'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_13 'p'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_14 'o'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_15 's'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_16 'e'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_17 'r'
+   extern const struct CORBA_TypeCode_struct
+      TC_Evolution_Composer_Recipient_struct;
+#define TC_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_Evolution_Composer_Recipient_struct)
+#endif
+   extern Evolution_Composer_Recipient
+      *Evolution_Composer_Recipient__alloc(void);
+   extern gpointer Evolution_Composer_Recipient__free(gpointer mem,
+						      gpointer dat,
+						      CORBA_boolean free_strings);	/* ORBit internal use */
+#endif
+#if !defined(ORBIT_DECL_CORBA_sequence_Evolution_Composer_Recipient) && !defined(_CORBA_sequence_Evolution_Composer_Recipient_defined)
+#define ORBIT_DECL_CORBA_sequence_Evolution_Composer_Recipient 1
+#define _CORBA_sequence_Evolution_Composer_Recipient_defined 1
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_0 'E'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_1 'v'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_2 'o'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_3 'l'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_4 'u'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_5 't'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_6 'i'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_7 'o'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_8 'n'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_9 '_'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_10 'C'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_11 'o'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_12 'm'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_13 'p'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_14 'o'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_15 's'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_16 'e'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_17 'r'
+   typedef struct
+   {
+      CORBA_unsigned_long _maximum,
+       _length;
+      Evolution_Composer_Recipient *_buffer;
+      CORBA_boolean _release;
+   }
+   CORBA_sequence_Evolution_Composer_Recipient;
+#if !defined(TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0)
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0 'E'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_1 'v'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_2 'o'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_3 'l'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_4 'u'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_5 't'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_6 'i'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_7 'o'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_8 'n'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_9 '_'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_10 'C'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_11 'o'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_12 'm'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_13 'p'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_14 'o'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_15 's'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_16 'e'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_17 'r'
+   extern const struct CORBA_TypeCode_struct
+      TC_CORBA_sequence_Evolution_Composer_Recipient_struct;
+#define TC_CORBA_sequence_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_CORBA_sequence_Evolution_Composer_Recipient_struct)
+#endif
+   extern CORBA_sequence_Evolution_Composer_Recipient
+      *CORBA_sequence_Evolution_Composer_Recipient__alloc(void);
+   extern gpointer CORBA_sequence_Evolution_Composer_Recipient__free(gpointer
+								     mem,
+								     gpointer
+								     dat,
+								     CORBA_boolean free_strings);	/* ORBit internal use */
+   Evolution_Composer_Recipient
+      *CORBA_sequence_Evolution_Composer_Recipient_allocbuf
+      (CORBA_unsigned_long len);
+#endif
+#if !defined(_Evolution_Composer_RecipientList_defined)
+#define _Evolution_Composer_RecipientList_defined 1
+   typedef CORBA_sequence_Evolution_Composer_Recipient
+      Evolution_Composer_RecipientList;
+#if !defined(TC_IMPL_TC_Evolution_Composer_RecipientList_0)
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_0 'E'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_1 'v'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_2 'o'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_3 'l'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_4 'u'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_5 't'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_6 'i'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_7 'o'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_8 'n'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_9 '_'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_10 'C'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_11 'o'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_12 'm'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_13 'p'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_14 'o'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_15 's'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_16 'e'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_17 'r'
+   extern const struct CORBA_TypeCode_struct
+      TC_Evolution_Composer_RecipientList_struct;
+#define TC_Evolution_Composer_RecipientList ((CORBA_TypeCode)&TC_Evolution_Composer_RecipientList_struct)
+#endif
+   extern Evolution_Composer_RecipientList
+      *Evolution_Composer_RecipientList__alloc(void);
+   extern gpointer Evolution_Composer_RecipientList__free(gpointer mem,
+							  gpointer dat,
+							  CORBA_boolean free_strings);	/* ORBit internal use */
+#endif
+#define ex_Evolution_Composer_CouldNotParse "IDL:Evolution/Composer/CouldNotParse:1.0"
+   void _ORBIT_Evolution_Composer_CouldNotParse_demarshal(GIOPRecvBuffer *
+							  _ORBIT_recv_buffer,
+							  CORBA_Environment *
+							  ev);
+   void _ORBIT_Evolution_Composer_CouldNotParse_marshal(GIOPSendBuffer *
+							_ORBIT_send_buffer,
+							CORBA_Environment *
+							ev);
+#if !defined(_Evolution_Composer_CouldNotParse_defined)
+#define _Evolution_Composer_CouldNotParse_defined 1
+   typedef struct
+   {
+      int dummy;
+   }
+   Evolution_Composer_CouldNotParse;
+
+#if !defined(TC_IMPL_TC_Evolution_Composer_CouldNotParse_0)
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_0 'E'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_1 'v'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_2 'o'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_3 'l'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_4 'u'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_5 't'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_6 'i'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_7 'o'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_8 'n'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_9 '_'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_10 'C'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_11 'o'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_12 'm'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_13 'p'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_14 'o'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_15 's'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_16 'e'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_17 'r'
+   extern const struct CORBA_TypeCode_struct
+      TC_Evolution_Composer_CouldNotParse_struct;
+#define TC_Evolution_Composer_CouldNotParse ((CORBA_TypeCode)&TC_Evolution_Composer_CouldNotParse_struct)
+#endif
+#define Evolution_Composer_CouldNotParse__alloc() NULL
+   extern gpointer Evolution_Composer_CouldNotParse__free(gpointer mem,
+							  gpointer dat,
+							  CORBA_boolean free_strings);	/* ORBit internal use */
+#endif
+
+/** POA structures **/
+   typedef struct
+   {
+      void *_private;
+      void (*set_headers) (PortableServer_Servant _servant,
+			   const Evolution_Composer_RecipientList * to,
+			   const Evolution_Composer_RecipientList * cc,
+			   const Evolution_Composer_RecipientList * bcc,
+			   const CORBA_char * subject,
+			   CORBA_Environment * ev);
+      void (*set_body_text) (PortableServer_Servant _servant,
+			     const CORBA_char * body, CORBA_Environment * ev);
+      void (*attach_MIME) (PortableServer_Servant _servant,
+			   const CORBA_char * data, CORBA_Environment * ev);
+      void (*attach_data) (PortableServer_Servant _servant,
+			   const CORBA_char * content_type,
+			   const CORBA_char * filename,
+			   const CORBA_char * description,
+			   const CORBA_boolean show_inline,
+			   const CORBA_char * data, CORBA_Environment * ev);
+      void (*show) (PortableServer_Servant _servant, CORBA_Environment * ev);
+   }
+   POA_Evolution_Composer__epv;
+   typedef struct
+   {
+      PortableServer_ServantBase__epv *_base_epv;
+      POA_Bonobo_Unknown__epv *Bonobo_Unknown_epv;
+      POA_Evolution_Composer__epv *Evolution_Composer_epv;
+   }
+   POA_Evolution_Composer__vepv;
+   typedef struct
+   {
+      void *_private;
+      POA_Evolution_Composer__vepv *vepv;
+   }
+   POA_Evolution_Composer;
+   extern void POA_Evolution_Composer__init(PortableServer_Servant servant,
+					    CORBA_Environment * ev);
+   extern void POA_Evolution_Composer__fini(PortableServer_Servant servant,
+					    CORBA_Environment * ev);
+
+/** prototypes **/
+#define Evolution_Composer_ref Bonobo_Unknown_ref
+#define Evolution_Composer_unref Bonobo_Unknown_unref
+#define Evolution_Composer_query_interface Bonobo_Unknown_query_interface
+   void Evolution_Composer_set_headers(Evolution_Composer _obj,
+				       const Evolution_Composer_RecipientList
+				       * to,
+				       const Evolution_Composer_RecipientList
+				       * cc,
+				       const Evolution_Composer_RecipientList
+				       * bcc, const CORBA_char * subject,
+				       CORBA_Environment * ev);
+   void Evolution_Composer_set_body_text(Evolution_Composer _obj,
+					 const CORBA_char * body,
+					 CORBA_Environment * ev);
+   void Evolution_Composer_attach_MIME(Evolution_Composer _obj,
+				       const CORBA_char * data,
+				       CORBA_Environment * ev);
+   void Evolution_Composer_attach_data(Evolution_Composer _obj,
+				       const CORBA_char * content_type,
+				       const CORBA_char * filename,
+				       const CORBA_char * description,
+				       const CORBA_boolean show_inline,
+				       const CORBA_char * data,
+				       CORBA_Environment * ev);
+   void Evolution_Composer_show(Evolution_Composer _obj,
+				CORBA_Environment * ev);
+
+   void _ORBIT_skel_Evolution_Composer_set_headers(POA_Evolution_Composer *
+						   _ORBIT_servant,
+						   GIOPRecvBuffer *
+						   _ORBIT_recv_buffer,
+						   CORBA_Environment * ev,
+						   void (*_impl_set_headers)
+						   (PortableServer_Servant
+						    _servant,
+						    const
+						    Evolution_Composer_RecipientList
+						    * to,
+						    const
+						    Evolution_Composer_RecipientList
+						    * cc,
+						    const
+						    Evolution_Composer_RecipientList
+						    * bcc,
+						    const CORBA_char *
+						    subject,
+						    CORBA_Environment * ev));
+   void _ORBIT_skel_Evolution_Composer_set_body_text(POA_Evolution_Composer *
+						     _ORBIT_servant,
+						     GIOPRecvBuffer *
+						     _ORBIT_recv_buffer,
+						     CORBA_Environment * ev,
+						     void
+						     (*_impl_set_body_text)
+						     (PortableServer_Servant
+						      _servant,
+						      const CORBA_char * body,
+						      CORBA_Environment *
+						      ev));
+   void _ORBIT_skel_Evolution_Composer_attach_MIME(POA_Evolution_Composer *
+						   _ORBIT_servant,
+						   GIOPRecvBuffer *
+						   _ORBIT_recv_buffer,
+						   CORBA_Environment * ev,
+						   void (*_impl_attach_MIME)
+						   (PortableServer_Servant
+						    _servant,
+						    const CORBA_char * data,
+						    CORBA_Environment * ev));
+   void _ORBIT_skel_Evolution_Composer_attach_data(POA_Evolution_Composer *
+						   _ORBIT_servant,
+						   GIOPRecvBuffer *
+						   _ORBIT_recv_buffer,
+						   CORBA_Environment * ev,
+						   void (*_impl_attach_data)
+						   (PortableServer_Servant
+						    _servant,
+						    const CORBA_char *
+						    content_type,
+						    const CORBA_char *
+						    filename,
+						    const CORBA_char *
+						    description,
+						    const CORBA_boolean
+						    show_inline,
+						    const CORBA_char * data,
+						    CORBA_Environment * ev));
+   void _ORBIT_skel_Evolution_Composer_show(POA_Evolution_Composer *
+					    _ORBIT_servant,
+					    GIOPRecvBuffer *
+					    _ORBIT_recv_buffer,
+					    CORBA_Environment * ev,
+					    void (*_impl_show)
+					    (PortableServer_Servant _servant,
+					     CORBA_Environment * ev));
+#ifdef __cplusplus
+}
+#endif				/* __cplusplus */
+
+#endif
+#undef ORBIT_IDL_SERIAL
diff --git a/calendar/gui/Evolution-Composer.idl b/calendar/gui/Evolution-Composer.idl
new file mode 100644
index 0000000000..1e3701a594
--- /dev/null
+++ b/calendar/gui/Evolution-Composer.idl
@@ -0,0 +1,94 @@
+/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Evolution-Composer.idl: Mail composer interfaces for Evolution
+ *
+ * Author:
+ *   Dan Winship <danw@helixcode.com>
+ * 
+ * (C) 2000 Helix Code, Inc.
+ */
+
+#include <Bonobo.idl>
+
+module Evolution {
+	
+	interface Composer : Bonobo::Unknown {
+		struct Recipient {
+			string name;	/* UTF-8 */
+			string address;
+		};
+		typedef sequence<Recipient> RecipientList;
+
+		/**
+		 * set_headers:
+		 * @to: the "To" recipients
+		 * @cc: the "CC" recipients
+		 * @bcc: the "Bcc" recipients
+		 * @subject: the subject of the message
+		 *
+		 * Sets the composer headers. Any of @to, @cc, and
+		 * @bcc may be an empty list, and @subject may be an
+		 * empty string.
+		 **/
+		void set_headers (in RecipientList to, in RecipientList cc,
+				  in RecipientList bcc, in string subject);
+
+		/**
+		 * set_body_text:
+		 * @body: the body
+		 *
+		 * Sets the text in the body of the composer to
+		 * the given UTF-8 plain text.
+		 **/
+		void set_body_text (in string body);
+
+		/**
+		 * attach_MIME:
+		 * @data: the attachment data
+		 *
+		 * This adds an attachment to the composer. @data
+		 * should be a fully-formed MIME body part.
+		 **/
+		exception CouldNotParse {};
+		void attach_MIME (in string data)
+			raises (CouldNotParse);
+
+		/**
+		 * attach_data:
+		 * @content_type: the Content-Type header
+		 * @filename: the suggested filename, or ""
+		 * @description: a description of the data, or ""
+		 * @show_inline: whether the attachment should be
+		 * displayed inline or not.
+		 * @data: the raw attachment data
+		 *
+		 * This adds @data as an attachment, using the provided
+		 * information to generate MIME headers. @content_type
+		 * may contain just a MIME content type, or it may
+		 * contain a complete Content-Type header. @filename
+		 * is a filename for the Content-Disposition header
+		 * @description (if not "") provides the
+		 * Content-Description, and @show_inline determines if the
+		 * Content-Disposition is "inline" or "attachment".
+		 *
+		 * If you need to specify headers or values other than
+		 * what this function can do, you will need to generate
+		 * all of the MIME headers yourself and use
+		 * add_attachment ().
+		 **/
+		void attach_data (in string content_type,
+				  in string filename,
+				  in string description,
+				  in boolean show_inline,
+				  in string data);
+
+
+		/**
+		 * show:
+		 *
+		 * Shows the composer and lets the user edit things
+		 * and send the message.
+		 **/
+		void show ();
+	};
+};
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 5376cbc1a6..7e13a47ff7 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -1,3 +1,21 @@
+## CORBA stuff
+
+IDLS =                          \
+        Evolution-Composer.idl  
+
+IDL_GENERATED =                 \
+        Evolution-Composer.h              \
+        Evolution-Composer-common.c       \
+        Evolution-Composer-skels.c        \
+        Evolution-Composer-stubs.c
+
+$(IDL_GENERATED): $(IDLS) 
+	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \
+                -I . Evolution-Composer.idl
+
+##
+
+
 SUBDIRS = dialogs
 
 help_base = $(datadir)/gnome/help/cal
@@ -43,6 +61,9 @@ glade_DATA = 					\
 glade_messages = event-editor-dialog.glade.h
 
 evolution_calendar_SOURCES =			\
+	Evolution-Composer.h			\
+	Evolution-Composer-common.c		\
+	Evolution-Composer-stubs.c		\
 	alarm.c					\
 	alarm.h					\
 	calendar-config.c			\
diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c
index f54fb0dea0..2353d615e8 100644
--- a/calendar/gui/e-meeting-edit.c
+++ b/calendar/gui/e-meeting-edit.c
@@ -25,7 +25,7 @@
 #include <icaltypes.h>
 #include <ical.h>
 #include <widgets/meeting-time-sel/e-meeting-time-sel.h>
-#include <composer/Composer.h>
+#include <Evolution-Composer.h>
 #include <string.h>
 #include "e-meeting-edit.h"
 
@@ -490,7 +490,7 @@ schedule_button_clicked_cb (GtkWidget *widget, gpointer data)
 #define COMPOSER_OAFID "OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b"
 
 
-static gchar *itip_methods = {
+static gchar *itip_methods[] = {
 	"REQUEST"
 };
 
@@ -516,7 +516,7 @@ send_button_clicked_cb (GtkWidget *widget, gpointer data)
 	gint cntr;
 	gint len;
 	CalComponentText caltext;
-	CORBA_char *content_type, *filename, *description, *data;
+	CORBA_char *content_type, *filename, *description, *attach_data;
 	CORBA_boolean show_inline;
 	CORBA_char tempstr[200];
 
@@ -568,23 +568,91 @@ send_button_clicked_cb (GtkWidget *widget, gpointer data)
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_printerr ("gui/e-meeting-edit.c: I couldn't set the composer headers via CORBA! Aagh.\n");
 		CORBA_exception_free (&ev);
+		return;
 	}
 
 	sprintf (tempstr, "text/calendar; METHOD=%s", itip_methods[METHOD_REQUEST]);
 	content_type = CORBA_string_alloc (strlen (tempstr));
+	strcpy (content_type, tempstr);
 	filename = CORBA_string_alloc (0);
 	description = CORBA_string_alloc (0);
 	show_inline = FALSE;
 
-	/* For tomorrow, I need to extract a string representation of our iCal object, and
-	   copy it into the `data' member, to send via CORBA. */
+	/* I need to create an encapsulating iCalendar component, and stuff our vEvent
+	   into it. */
+	{
+		icalcomponent *comp;
+		icalproperty *prop;
+		icalvalue *value;
+		gchar *ical_string;
+
+		comp = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
+		
+		prop = icalproperty_new (ICAL_PRODID_PROPERTY);
+		value = icalvalue_new_text ("-//HelixCode/Evolution//EN");
+		icalproperty_set_value (prop, value);
+		icalcomponent_add_property (comp, prop);
+
+		prop = icalproperty_new (ICAL_VERSION_PROPERTY);
+		value = icalvalue_new_text ("2.0");
+		icalproperty_set_value (prop, value);
+		icalcomponent_add_property (comp, prop);
+
+		prop = icalproperty_new (ICAL_METHOD_PROPERTY);
+		value = icalvalue_new_text ("REQUEST");
+		icalproperty_set_value (prop, value);
+		icalcomponent_add_property (comp, prop);
+
+		icalcomponent_add_component (comp, priv->vevent);
+
+		ical_string = icalcomponent_as_ical_string (comp);
+		attach_data = CORBA_string_alloc (strlen (ical_string));
+		strcpy (attach_data, ical_string);
+
+		icalcomponent_remove_component (comp, priv->vevent);
+		icalcomponent_free (comp);
+	}
+
+	Evolution_Composer_attach_data (composer_server, 
+					content_type, filename, description,
+					show_inline, attach_data,
+					&ev);
 	
+	if (ev._major != CORBA_NO_EXCEPTION) {
+		g_printerr ("gui/e-meeting-edit.c: I couldn't attach data to the composer via CORBA! Aagh.\n");
+		CORBA_exception_free (&ev);
+		return;
+	}
+	
+	Evolution_Composer_show (composer_server, &ev);
 
+	if (ev._major != CORBA_NO_EXCEPTION) {
+		g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");
+		CORBA_exception_free (&ev);
+		return;
+	}
 	
 	CORBA_exception_free (&ev);
 
-	bonobo_object_unref (BONOBO_OBJECT (bonobo_server));
+	/* Let's free shit up. */
+	for (cntr = 0; cntr < priv->numentries; cntr++) {
+		recipient = &(to_list->_buffer[cntr]);
+		CORBA_free (recipient->name);
+		CORBA_free (recipient->address);
+	}
+
+	CORBA_free (to_list->_buffer);
+	CORBA_free (to_list);
+	CORBA_free (cc_list);
+	CORBA_free (bcc_list);
 
+	CORBA_free (subject);
+	CORBA_free (content_type);
+	CORBA_free (filename);
+	CORBA_free (description);
+	CORBA_free (attach_data);
+
+	bonobo_object_unref (BONOBO_OBJECT (bonobo_server));
 
 }
 
@@ -797,6 +865,7 @@ e_meeting_edit (EMeetingEditor *editor)
 	priv->role_entry = glade_xml_get_widget (priv->xml, "role_entry");
 	priv->rsvp_check = glade_xml_get_widget (priv->xml, "rsvp_check");
 	priv->schedule_button = glade_xml_get_widget (priv->xml, "schedule_button");
+	priv->send_button = glade_xml_get_widget (priv->xml, "send_button");
 
 	gtk_clist_set_column_justification (GTK_CLIST (priv->attendee_list), ROLE_COL, GTK_JUSTIFY_CENTER);
 	gtk_clist_set_column_justification (GTK_CLIST (priv->attendee_list), RSVP_COL, GTK_JUSTIFY_CENTER);