diff options
Diffstat (limited to 'calendar/gui')
| -rw-r--r-- | calendar/gui/Evolution-Composer.h | 573 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 4 | ||||
| -rw-r--r-- | calendar/gui/e-itip-control.c | 26 | ||||
| -rw-r--r-- | calendar/gui/e-meeting-edit.c | 20 |
4 files changed, 303 insertions, 320 deletions
diff --git a/calendar/gui/Evolution-Composer.h b/calendar/gui/Evolution-Composer.h index f8e0795590..bd61419d04 100644 --- a/calendar/gui/Evolution-Composer.h +++ b/calendar/gui/Evolution-Composer.h @@ -15,352 +15,335 @@ extern "C" /** 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) +#if !defined(ORBIT_DECL_GNOME_Evolution_Composer) && !defined(_GNOME_Evolution_Composer_defined) +#define ORBIT_DECL_GNOME_Evolution_Composer 1 +#define _GNOME_Evolution_Composer_defined 1 +#define GNOME_Evolution_Composer__free CORBA_Object__free + typedef CORBA_Object GNOME_Evolution_Composer; + extern CORBA_unsigned_long GNOME_Evolution_Composer__classid; +#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_0) +#define TC_IMPL_TC_GNOME_Evolution_Composer_0 'E' +#define TC_IMPL_TC_GNOME_Evolution_Composer_1 'v' +#define TC_IMPL_TC_GNOME_Evolution_Composer_2 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_3 'l' +#define TC_IMPL_TC_GNOME_Evolution_Composer_4 'u' +#define TC_IMPL_TC_GNOME_Evolution_Composer_5 't' +#define TC_IMPL_TC_GNOME_Evolution_Composer_6 'i' +#define TC_IMPL_TC_GNOME_Evolution_Composer_7 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_8 'n' +#define TC_IMPL_TC_GNOME_Evolution_Composer_9 '_' +#define TC_IMPL_TC_GNOME_Evolution_Composer_10 'C' +#define TC_IMPL_TC_GNOME_Evolution_Composer_11 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_12 'm' +#define TC_IMPL_TC_GNOME_Evolution_Composer_13 'p' +#define TC_IMPL_TC_GNOME_Evolution_Composer_14 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_15 's' +#define TC_IMPL_TC_GNOME_Evolution_Composer_16 'e' +#define TC_IMPL_TC_GNOME_Evolution_Composer_17 'r' + extern const struct CORBA_TypeCode_struct + TC_GNOME_Evolution_Composer_struct; +#define TC_GNOME_Evolution_Composer ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_struct) #endif #endif -#if !defined(_Evolution_Composer_Recipient_defined) -#define _Evolution_Composer_Recipient_defined 1 +#if !defined(_GNOME_Evolution_Composer_Recipient_defined) +#define _GNOME_Evolution_Composer_Recipient_defined 1 typedef struct { CORBA_char *name; CORBA_char *address; } - Evolution_Composer_Recipient; + GNOME_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' +#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_0) +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_0 'E' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_1 'v' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_2 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_3 'l' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_4 'u' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_5 't' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_6 'i' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_7 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_8 'n' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_9 '_' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_10 'C' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_11 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_12 'm' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_13 'p' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_14 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_15 's' +#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_16 'e' +#define TC_IMPL_TC_GNOME_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) + TC_GNOME_Evolution_Composer_Recipient_struct; +#define TC_GNOME_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_GNOME_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 */ + extern GNOME_Evolution_Composer_Recipient + *GNOME_Evolution_Composer_Recipient__alloc(void); + extern gpointer GNOME_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' +#if !defined(ORBIT_DECL_CORBA_sequence_GNOME_Evolution_Composer_Recipient) && !defined(_CORBA_sequence_GNOME_Evolution_Composer_Recipient_defined) +#define ORBIT_DECL_CORBA_sequence_GNOME_Evolution_Composer_Recipient 1 +#define _CORBA_sequence_GNOME_Evolution_Composer_Recipient_defined 1 +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0 'E' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_1 'v' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_2 'o' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_3 'l' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_4 'u' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_5 't' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_6 'i' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_7 'o' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_8 'n' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_9 '_' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_10 'C' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_11 'o' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_12 'm' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_13 'p' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_14 'o' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_15 's' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_16 'e' +#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_17 'r' typedef struct { CORBA_unsigned_long _maximum, _length; - Evolution_Composer_Recipient *_buffer; + GNOME_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' + CORBA_sequence_GNOME_Evolution_Composer_Recipient; +#if !defined(TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0) +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0 'E' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_1 'v' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_2 'o' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_3 'l' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_4 'u' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_5 't' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_6 'i' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_7 'o' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_8 'n' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_9 '_' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_10 'C' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_11 'o' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_12 'm' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_13 'p' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_14 'o' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_15 's' +#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_16 'e' +#define TC_IMPL_TC_CORBA_sequence_GNOME_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) + TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_struct; +#define TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_CORBA_sequence_GNOME_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 + extern CORBA_sequence_GNOME_Evolution_Composer_Recipient + *CORBA_sequence_GNOME_Evolution_Composer_Recipient__alloc(void); + extern gpointer + CORBA_sequence_GNOME_Evolution_Composer_Recipient__free(gpointer mem, + gpointer dat, + CORBA_boolean free_strings); /* ORBit internal use */ + GNOME_Evolution_Composer_Recipient + *CORBA_sequence_GNOME_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' +#if !defined(_GNOME_Evolution_Composer_RecipientList_defined) +#define _GNOME_Evolution_Composer_RecipientList_defined 1 + typedef CORBA_sequence_GNOME_Evolution_Composer_Recipient + GNOME_Evolution_Composer_RecipientList; +#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_0) +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_0 'E' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_1 'v' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_2 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_3 'l' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_4 'u' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_5 't' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_6 'i' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_7 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_8 'n' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_9 '_' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_10 'C' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_11 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_12 'm' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_13 'p' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_14 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_15 's' +#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_16 'e' +#define TC_IMPL_TC_GNOME_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) + TC_GNOME_Evolution_Composer_RecipientList_struct; +#define TC_GNOME_Evolution_Composer_RecipientList ((CORBA_TypeCode)&TC_GNOME_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 */ + extern GNOME_Evolution_Composer_RecipientList + *GNOME_Evolution_Composer_RecipientList__alloc(void); + extern gpointer GNOME_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 +#define ex_GNOME_Evolution_Composer_CouldNotParse "IDL:GNOME/Evolution/Composer/CouldNotParse:1.0" + void _ORBIT_GNOME_Evolution_Composer_CouldNotParse_demarshal(GIOPRecvBuffer + * + _ORBIT_recv_buffer, + CORBA_Environment + * ev); + void _ORBIT_GNOME_Evolution_Composer_CouldNotParse_marshal(GIOPSendBuffer * + _ORBIT_send_buffer, + CORBA_Environment + * ev); +#if !defined(_GNOME_Evolution_Composer_CouldNotParse_defined) +#define _GNOME_Evolution_Composer_CouldNotParse_defined 1 typedef struct { int dummy; } - Evolution_Composer_CouldNotParse; + GNOME_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' +#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_0) +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_0 'E' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_1 'v' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_2 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_3 'l' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_4 'u' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_5 't' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_6 'i' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_7 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_8 'n' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_9 '_' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_10 'C' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_11 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_12 'm' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_13 'p' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_14 'o' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_15 's' +#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_16 'e' +#define TC_IMPL_TC_GNOME_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) + TC_GNOME_Evolution_Composer_CouldNotParse_struct; +#define TC_GNOME_Evolution_Composer_CouldNotParse ((CORBA_TypeCode)&TC_GNOME_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 */ +#define GNOME_Evolution_Composer_CouldNotParse__alloc() NULL + extern gpointer GNOME_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 (*setHeaders) (PortableServer_Servant _servant, + const GNOME_Evolution_Composer_RecipientList * to, + const GNOME_Evolution_Composer_RecipientList * cc, + const GNOME_Evolution_Composer_RecipientList * bcc, + const CORBA_char * subject, CORBA_Environment * ev); + void (*setBodyText) (PortableServer_Servant _servant, + const CORBA_char * body, CORBA_Environment * ev); + void (*attachMIME) (PortableServer_Servant _servant, + const CORBA_char * data, CORBA_Environment * ev); + void (*attachData) (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; + POA_GNOME_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_GNOME_Evolution_Composer__epv *GNOME_Evolution_Composer_epv; } - POA_Evolution_Composer__vepv; + POA_GNOME_Evolution_Composer__vepv; typedef struct { void *_private; - POA_Evolution_Composer__vepv *vepv; + POA_GNOME_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); + POA_GNOME_Evolution_Composer; + extern void POA_GNOME_Evolution_Composer__init(PortableServer_Servant + servant, + CORBA_Environment * ev); + extern void POA_GNOME_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_queryInterface Bonobo_Unknown_queryInterface - 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); +#define GNOME_Evolution_Composer_ref Bonobo_Unknown_ref +#define GNOME_Evolution_Composer_unref Bonobo_Unknown_unref +#define GNOME_Evolution_Composer_queryInterface Bonobo_Unknown_queryInterface + void GNOME_Evolution_Composer_setHeaders(GNOME_Evolution_Composer _obj, + const + GNOME_Evolution_Composer_RecipientList + * to, + const + GNOME_Evolution_Composer_RecipientList + * cc, + const + GNOME_Evolution_Composer_RecipientList + * bcc, const CORBA_char * subject, + CORBA_Environment * ev); + void GNOME_Evolution_Composer_setBodyText(GNOME_Evolution_Composer _obj, + const CORBA_char * body, + CORBA_Environment * ev); + void GNOME_Evolution_Composer_attachMIME(GNOME_Evolution_Composer _obj, + const CORBA_char * data, + CORBA_Environment * ev); + void GNOME_Evolution_Composer_attachData(GNOME_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 GNOME_Evolution_Composer_show(GNOME_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)); + void + _ORBIT_skel_GNOME_Evolution_Composer_setHeaders + (POA_GNOME_Evolution_Composer * _ORBIT_servant, + GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, + void (*_impl_setHeaders) (PortableServer_Servant _servant, + const GNOME_Evolution_Composer_RecipientList + * to, + const GNOME_Evolution_Composer_RecipientList + * cc, + const GNOME_Evolution_Composer_RecipientList + * bcc, const CORBA_char * subject, + CORBA_Environment * ev)); + void + _ORBIT_skel_GNOME_Evolution_Composer_setBodyText + (POA_GNOME_Evolution_Composer * _ORBIT_servant, + GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, + void (*_impl_setBodyText) (PortableServer_Servant _servant, + const CORBA_char * body, + CORBA_Environment * ev)); + void + _ORBIT_skel_GNOME_Evolution_Composer_attachMIME + (POA_GNOME_Evolution_Composer * _ORBIT_servant, + GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, + void (*_impl_attachMIME) (PortableServer_Servant _servant, + const CORBA_char * data, + CORBA_Environment * ev)); + void + _ORBIT_skel_GNOME_Evolution_Composer_attachData + (POA_GNOME_Evolution_Composer * _ORBIT_servant, + GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev, + void (*_impl_attachData) (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_GNOME_Evolution_Composer_show(POA_GNOME_Evolution_Composer + * _ORBIT_servant, + GIOPRecvBuffer * + _ORBIT_recv_buffer, + CORBA_Environment * ev, + void (*_impl_show) + (PortableServer_Servant + _servant, + CORBA_Environment * ev)); #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 724594780d..331c0c68ee 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -10,8 +10,8 @@ IDL_GENERATED = \ Evolution-Composer-stubs.c $(IDL_GENERATED): $(IDLS) - $(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ - -I . $(srcdir)/../../composer/Evolution-Composer.idl + $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(srcdir)/../../composer/Evolution-Composer.idl SUBDIRS = dialogs diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 2376cdb5b5..5d4ca06a74 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -235,10 +235,10 @@ static void send_itip_reply (EItipControlPrivate *priv) { BonoboObjectClient *bonobo_server; - Evolution_Composer composer_server; + GNOME_Evolution_Composer composer_server; CORBA_Environment ev; - Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list; - Evolution_Composer_Recipient *recipient; + GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list; + GNOME_Evolution_Composer_Recipient *recipient; CORBA_char *subject; CalComponentText caltext; CORBA_char *content_type, *filename, *description, *attach_data; @@ -256,10 +256,10 @@ send_itip_reply (EItipControlPrivate *priv) /* Now I have to make a CORBA sequence that represents a recipient list with one item, for the organizer. */ - to_list = Evolution_Composer_RecipientList__alloc (); + to_list = GNOME_Evolution_Composer_RecipientList__alloc (); to_list->_maximum = 1; to_list->_length = 1; - to_list->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (1); + to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (1); recipient = &(to_list->_buffer[0]); recipient->name = CORBA_string_alloc (0); /* FIXME: we may want an actual name here. */ @@ -267,16 +267,16 @@ send_itip_reply (EItipControlPrivate *priv) recipient->address = CORBA_string_alloc (strlen (priv->organizer)); strcpy (recipient->address, priv->organizer); - cc_list = Evolution_Composer_RecipientList__alloc (); + cc_list = GNOME_Evolution_Composer_RecipientList__alloc (); cc_list->_maximum = cc_list->_length = 0; - bcc_list = Evolution_Composer_RecipientList__alloc (); + bcc_list = GNOME_Evolution_Composer_RecipientList__alloc (); bcc_list->_maximum = bcc_list->_length = 0; cal_component_get_summary (priv->cal_comp, &caltext); subject = CORBA_string_alloc (strlen (caltext.value)); strcpy (subject, caltext.value); - Evolution_Composer_set_headers (composer_server, to_list, cc_list, bcc_list, subject, &ev); + GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &ev); 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); @@ -331,10 +331,10 @@ send_itip_reply (EItipControlPrivate *priv) } - Evolution_Composer_attach_data (composer_server, - content_type, filename, description, - show_inline, attach_data, - &ev); + GNOME_Evolution_Composer_attachData (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"); @@ -342,7 +342,7 @@ send_itip_reply (EItipControlPrivate *priv) return; } - Evolution_Composer_show (composer_server, &ev); + GNOME_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"); diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c index cf1cffee52..daf5c73035 100644 --- a/calendar/gui/e-meeting-edit.c +++ b/calendar/gui/e-meeting-edit.c @@ -517,10 +517,10 @@ static void send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv) { BonoboObjectClient *bonobo_server; - Evolution_Composer composer_server; + GNOME_Evolution_Composer composer_server; CORBA_Environment ev; - Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list; - Evolution_Composer_Recipient *recipient; + GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list; + GNOME_Evolution_Composer_Recipient *recipient; gchar *cell_text; CORBA_char *subject; gint cntr; @@ -542,10 +542,10 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv) /* All right, now I have to convert my list of recipients into one of those CORBA sequences. */ - to_list = Evolution_Composer_RecipientList__alloc (); + to_list = GNOME_Evolution_Composer_RecipientList__alloc (); to_list->_maximum = priv->numentries; to_list->_length = priv->numentries; - to_list->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (priv->numentries); + to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (priv->numentries); for (cntr = 0; cntr < priv->numentries; cntr++) { gtk_clist_get_text (GTK_CLIST (priv->attendee_list), @@ -560,16 +560,16 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv) strcpy (recipient->address, cell_text); } - cc_list = Evolution_Composer_RecipientList__alloc (); + cc_list = GNOME_Evolution_Composer_RecipientList__alloc (); cc_list->_maximum = cc_list->_length = 0; - bcc_list = Evolution_Composer_RecipientList__alloc (); + bcc_list = GNOME_Evolution_Composer_RecipientList__alloc (); bcc_list->_maximum = bcc_list->_length = 0; cal_component_get_summary (priv->comp, &caltext); subject = CORBA_string_alloc (strlen (caltext.value)); strcpy (subject, caltext.value); - Evolution_Composer_set_headers (composer_server, to_list, cc_list, bcc_list, subject, &ev); + GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &ev); 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); @@ -635,7 +635,7 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv) fclose (fp); } - Evolution_Composer_attach_data (composer_server, + GNOME_Evolution_Composer_attachData (composer_server, content_type, filename, description, show_inline, attach_data, &ev); @@ -646,7 +646,7 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv) return; } - Evolution_Composer_show (composer_server, &ev); + GNOME_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"); |