From 382f46586ec169220b6569a6df6fb3518b2f2208 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 26 Oct 2001 14:34:37 +0000 Subject: modify fields 2001-10-26 JP Rosevear * conduits/calendar/calendar-conduit.h: modify fields * conduits/todo/todo-conduit.h: as above * conduits/calendar/calendar-conduit.c (print_remote): free the struct after use (e_calendar_context_new): explicitly init context fields (e_calendar_context_destroy): free local records and properly free changed hash elements (start_calendar_server_cb): tidy (start_calendar_server): ditto (free_local): free a local record (local_record_to_pilot_record): use a static buffer to avoid leaks (local_record_from_comp): only copy over alarm stuff from the original record, we sync everything else (local_record_from_uid): unref the comp when we are done (pre_sync): free change_id (post_sync): ditto (for_each): track locals (for_each_modified): ditto (free_match): use free_local * conduits/todo/todo-conduit.c: as above svn path=/trunk/; revision=14139 --- calendar/ChangeLog | 26 ++ calendar/conduits/calendar/calendar-conduit.c | 108 +++++--- calendar/conduits/calendar/calendar-conduit.h | 4 +- calendar/conduits/todo/todo-conduit.c | 117 +++++---- calendar/conduits/todo/todo-conduit.h | 9 +- calendar/gui/Evolution-Composer.h | 352 -------------------------- 6 files changed, 177 insertions(+), 439 deletions(-) delete mode 100644 calendar/gui/Evolution-Composer.h diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 5e29e80909..2914eebdb4 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,29 @@ +2001-10-26 JP Rosevear + + * conduits/calendar/calendar-conduit.h: modify fields + + * conduits/todo/todo-conduit.h: as above + + * conduits/calendar/calendar-conduit.c (print_remote): free the + struct after use + (e_calendar_context_new): explicitly init context fields + (e_calendar_context_destroy): free local records and properly free + changed hash elements + (start_calendar_server_cb): tidy + (start_calendar_server): ditto + (free_local): free a local record + (local_record_to_pilot_record): use a static buffer to avoid leaks + (local_record_from_comp): only copy over alarm stuff from the + original record, we sync everything else + (local_record_from_uid): unref the comp when we are done + (pre_sync): free change_id + (post_sync): ditto + (for_each): track locals + (for_each_modified): ditto + (free_match): use free_local + + * conduits/todo/todo-conduit.c: as above + 2001-10-26 Federico Mena Quintero * pcs/cal.c (cal_construct): Get a fresh CORBA_Environment for diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index a985ca0e35..d79c238121 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -45,6 +45,7 @@ #include +static void free_local (ECalLocalRecord *local); GnomePilotConduit * conduit_get_gpilot_conduit (guint32); void conduit_destroy_gpilot_conduit (GnomePilotConduit*); @@ -112,6 +113,8 @@ static char *print_remote (GnomePilotRecord *remote) appt.note ? appt.note : ""); + free_Appointment (&appt); + return buff; } @@ -123,18 +126,29 @@ e_calendar_context_new (guint32 pilot_id) calconduit_load_configuration (&ctxt->cfg, pilot_id); + ctxt->client = NULL; + ctxt->uids = NULL; + ctxt->changed_hash = NULL; + ctxt->changed = NULL; + ctxt->locals = NULL; + ctxt->map = NULL; + return ctxt; } -static void +static gboolean e_calendar_context_foreach_change (gpointer key, gpointer value, gpointer data) { g_free (key); + + return TRUE; } static void e_calendar_context_destroy (ECalConduitContext *ctxt) { + GList *l; + g_return_if_fail (ctxt != NULL); if (ctxt->cfg != NULL) @@ -143,19 +157,24 @@ e_calendar_context_destroy (ECalConduitContext *ctxt) if (ctxt->client != NULL) gtk_object_unref (GTK_OBJECT (ctxt->client)); - if (ctxt->calendar_file) - g_free (ctxt->calendar_file); - - if (ctxt->uids) + if (ctxt->uids != NULL) cal_obj_uid_list_free (ctxt->uids); - if (ctxt->changed_hash) - g_hash_table_foreach (ctxt->changed_hash, e_calendar_context_foreach_change, NULL); + if (ctxt->changed_hash != NULL) { + g_hash_table_foreach_remove (ctxt->changed_hash, e_calendar_context_foreach_change, NULL); + g_hash_table_destroy (ctxt->changed_hash); + } + + if (ctxt->locals != NULL) { + for (l = ctxt->locals; l != NULL; l = l->next) + free_local (l->data); + g_list_free (ctxt->locals); + } - if (ctxt->changed) + if (ctxt->changed != NULL) cal_client_change_list_free (ctxt->changed); - if (ctxt->map) + if (ctxt->map != NULL) e_pilot_map_destroy (ctxt->map); g_free (ctxt); @@ -167,45 +186,45 @@ start_calendar_server_cb (CalClient *cal_client, CalClientOpenStatus status, gpointer data) { - ECalConduitContext *ctxt; - - ctxt = data; - - LOG (" entering start_calendar_server_cb\n"); + gboolean *success = data; if (status == CAL_CLIENT_OPEN_SUCCESS) { - ctxt->calendar_open_success = TRUE; - LOG (" success\n"); - } else - LOG (" open of calendar failed\n"); - + *success = TRUE; + } else { + *success = FALSE; + WARN ("Failed to open calendar!\n"); + } + gtk_main_quit (); /* end the sub event loop */ } static int start_calendar_server (ECalConduitContext *ctxt) { + char *calendar_file; + gboolean success = FALSE; g_return_val_if_fail (ctxt != NULL, -2); ctxt->client = cal_client_new (); /* FIX ME */ - ctxt->calendar_file = g_concat_dir_and_file (g_get_home_dir (), - "evolution/local/Calendar/calendar.ics"); + calendar_file = g_concat_dir_and_file (g_get_home_dir (), + "evolution/local/" + "Calendar/calendar.ics"); gtk_signal_connect (GTK_OBJECT (ctxt->client), "cal_opened", - start_calendar_server_cb, ctxt); + start_calendar_server_cb, &success); - LOG (" calling cal_client_open_calendar\n"); - if (!cal_client_open_calendar (ctxt->client, ctxt->calendar_file, FALSE)) + if (!cal_client_open_calendar (ctxt->client, calendar_file, FALSE)) return -1; /* run a sub event loop to turn cal-client's async load notification into a synchronous call */ gtk_main (); + g_free (calendar_file); - if (ctxt->calendar_open_success) + if (success) return 0; return -1; @@ -475,12 +494,22 @@ compute_status (ECalConduitContext *ctxt, ECalLocalRecord *local, const char *ui } } +static void +free_local (ECalLocalRecord *local) +{ + gtk_object_unref (GTK_OBJECT (local->comp)); + free_Appointment (local->appt); + g_free (local->appt); + g_free (local); +} + static GnomePilotRecord local_record_to_pilot_record (ECalLocalRecord *local, ECalConduitContext *ctxt) { GnomePilotRecord p; - + static char record[0xffff]; + g_assert (local->comp != NULL); g_assert (local->appt != NULL ); @@ -491,7 +520,7 @@ local_record_to_pilot_record (ECalLocalRecord *local, p.secret = local->local.secret; /* Generate pilot record structure */ - p.record = g_new0 (char, 0xffff); + p.record = record; p.length = pack_Appointment (local->appt, p.record, 0xffff); return p; @@ -528,6 +557,7 @@ local_record_from_comp (ECalLocalRecord *local, CalComponent *comp, ECalConduitC * we don't overwrite them */ if (local->local.ID != 0) { + struct Appointment appt; char record[0xffff]; int cat = 0; @@ -535,8 +565,13 @@ local_record_from_comp (ECalLocalRecord *local, CalComponent *comp, ECalConduitC ctxt->dbi->db_handle, local->local.ID, &record, NULL, NULL, NULL, &cat) > 0) { - local->local.category = cat; - unpack_Appointment (local->appt, record, 0xffff); + local->local.category = cat; + memset (&appt, 0, sizeof (struct Appointment)); + unpack_Appointment (&appt, record, 0xffff); + local->appt->alarm = appt.alarm; + local->appt->advance = appt.advance; + local->appt->advanceUnits = appt.advanceUnits; + free_Appointment (&appt); } } @@ -696,11 +731,13 @@ local_record_from_uid (ECalLocalRecord *local, if (status == CAL_CLIENT_GET_SUCCESS) { local_record_from_comp (local, comp, ctxt); + gtk_object_unref (GTK_OBJECT (comp)); } else if (status == CAL_CLIENT_GET_NOT_FOUND) { comp = cal_component_new (); cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT); cal_component_set_uid (comp, uid); local_record_from_comp (local, comp, ctxt); + gtk_object_unref (GTK_OBJECT (comp)); } else { INFO ("Object did not exist"); } @@ -954,7 +991,8 @@ pre_sync (GnomePilotConduit *conduit, change_id = g_strdup_printf ("pilot-sync-evolution-calendar-%d", ctxt->cfg->pilot_id); ctxt->changed = cal_client_get_changes (ctxt->client, CALOBJ_TYPE_EVENT, change_id); ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal); - + g_free (change_id); + for (l = ctxt->changed; l != NULL; l = l->next) { CalClientChange *ccc = l->data; GList *multi_uid = NULL, *multi_ccc = NULL; @@ -1043,7 +1081,8 @@ post_sync (GnomePilotConduit *conduit, change_id = g_strdup_printf ("pilot-sync-evolution-calendar-%d", ctxt->cfg->pilot_id); changed = cal_client_get_changes (ctxt->client, CALOBJ_TYPE_EVENT, change_id); cal_client_change_list_free (changed); - + g_free (change_id); + LOG ("---------------------------------------------------------\n"); return 0; @@ -1101,6 +1140,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, *local = g_new0 (ECalLocalRecord, 1); local_record_from_uid (*local, uids->data, ctxt); + g_list_prepend (ctxt->locals, *local); iterator = uids; } else { @@ -1115,6 +1155,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, *local = g_new0 (ECalLocalRecord, 1); local_record_from_uid (*local, iterator->data, ctxt); + g_list_prepend (ctxt->locals, *local); } else { LOG ("for_each ending"); @@ -1153,6 +1194,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, *local = g_new0 (ECalLocalRecord, 1); local_record_from_comp (*local, ccc->comp, ctxt); + g_list_prepend (ctxt->locals, *local); } else { LOG ("no events"); @@ -1166,6 +1208,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, *local = g_new0 (ECalLocalRecord, 1); local_record_from_comp (*local, ccc->comp, ctxt); + g_list_prepend (ctxt->locals, *local); } else { LOG ("for_each_modified ending"); @@ -1328,8 +1371,7 @@ free_match (GnomePilotConduitSyncAbs *conduit, g_return_val_if_fail (local != NULL, -1); - gtk_object_unref (GTK_OBJECT (local->comp)); - g_free (local); + free_local (local); return 0; } diff --git a/calendar/conduits/calendar/calendar-conduit.h b/calendar/conduits/calendar/calendar-conduit.h index 886588c978..da77943e86 100644 --- a/calendar/conduits/calendar/calendar-conduit.h +++ b/calendar/conduits/calendar/calendar-conduit.h @@ -61,14 +61,12 @@ struct _ECalConduitContext { struct AppointmentAppInfo ai; CalClient *client; - char *calendar_file; - gboolean calendar_open_success; icaltimezone *timezone; - time_t since; GList *uids; GList *changed; GHashTable *changed_hash; + GList *locals; EPilotMap *map; }; diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 930a5dfd96..4c0b3b92da 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -45,6 +45,7 @@ #include +static void free_local (EToDoLocalRecord *local); GnomePilotConduit * conduit_get_gpilot_conduit (guint32); void conduit_destroy_gpilot_conduit (GnomePilotConduit*); @@ -116,6 +117,8 @@ static char *print_remote (GnomePilotRecord *remote) todo.note ? todo.note : ""); + free_ToDo (&todo); + return buff; } @@ -127,18 +130,29 @@ e_todo_context_new (guint32 pilot_id) todoconduit_load_configuration (&ctxt->cfg, pilot_id); + ctxt->client = NULL; + ctxt->uids = NULL; + ctxt->changed_hash = NULL; + ctxt->changed = NULL; + ctxt->locals = NULL; + ctxt->map = NULL; + return ctxt; } -static void +static gboolean e_todo_context_foreach_change (gpointer key, gpointer value, gpointer data) { g_free (key); + + return TRUE; } static void e_todo_context_destroy (EToDoConduitContext *ctxt) { + GList *l; + g_return_if_fail (ctxt != NULL); if (ctxt->cfg != NULL) @@ -147,19 +161,24 @@ e_todo_context_destroy (EToDoConduitContext *ctxt) if (ctxt->client != NULL) gtk_object_unref (GTK_OBJECT (ctxt->client)); - if (ctxt->calendar_file) - g_free (ctxt->calendar_file); - - if (ctxt->uids) + if (ctxt->uids != NULL) cal_obj_uid_list_free (ctxt->uids); - if (ctxt->changed_hash) - g_hash_table_foreach (ctxt->changed_hash, e_todo_context_foreach_change, NULL); + if (ctxt->changed_hash != NULL) { + g_hash_table_foreach_remove (ctxt->changed_hash, e_todo_context_foreach_change, NULL); + g_hash_table_destroy (ctxt->changed_hash); + } - if (ctxt->changed) + if (ctxt->locals != NULL) { + for (l = ctxt->locals; l != NULL; l = l->next) + free_local (l->data); + g_list_free (ctxt->locals); + } + + if (ctxt->changed != NULL) cal_client_change_list_free (ctxt->changed); - if (ctxt->map) + if (ctxt->map != NULL) e_pilot_map_destroy (ctxt->map); g_free (ctxt); @@ -171,45 +190,45 @@ start_calendar_server_cb (CalClient *cal_client, CalClientOpenStatus status, gpointer data) { - EToDoConduitContext *ctxt; - - ctxt = data; - - LOG (" entering start_calendar_server_cb\n"); + gboolean *success = data; if (status == CAL_CLIENT_OPEN_SUCCESS) { - ctxt->calendar_open_success = TRUE; - LOG (" success\n"); - } else - LOG (" open of calendar failed\n"); - + *success = TRUE; + } else { + *success = FALSE; + WARN ("Failed to open calendar!\n"); + } + gtk_main_quit (); /* end the sub event loop */ } static int start_calendar_server (EToDoConduitContext *ctxt) { + char *calendar_file; + gboolean success = FALSE; g_return_val_if_fail (ctxt != NULL, -2); ctxt->client = cal_client_new (); /* FIX ME */ - ctxt->calendar_file = g_concat_dir_and_file (g_get_home_dir (), - "evolution/local/Tasks/tasks.ics"); + calendar_file = g_concat_dir_and_file (g_get_home_dir (), + "evolution/local/" + "Tasks/tasks.ics"); gtk_signal_connect (GTK_OBJECT (ctxt->client), "cal_opened", - start_calendar_server_cb, ctxt); + start_calendar_server_cb, &success); - LOG (" calling cal_client_open_calendar\n"); - if (!cal_client_open_calendar (ctxt->client, ctxt->calendar_file, FALSE)) + if (!cal_client_open_calendar (ctxt->client, calendar_file, FALSE)) return -1; /* run a sub event loop to turn cal-client's async load notification into a synchronous call */ gtk_main (); - - if (ctxt->calendar_open_success) + g_free (calendar_file); + + if (success) return 0; return -1; @@ -327,12 +346,22 @@ compute_status (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char * } } +static void +free_local (EToDoLocalRecord *local) +{ + gtk_object_unref (GTK_OBJECT (local->comp)); + free_ToDo (local->todo); + g_free (local->todo); + g_free (local); +} + static GnomePilotRecord local_record_to_pilot_record (EToDoLocalRecord *local, EToDoConduitContext *ctxt) { GnomePilotRecord p; - + static char record[0xffff]; + g_assert (local->comp != NULL); g_assert (local->todo != NULL ); @@ -345,7 +374,7 @@ local_record_to_pilot_record (EToDoLocalRecord *local, p.secret = local->local.secret; /* Generate pilot record structure */ - p.record = g_new0 (char, 0xffff); + p.record = record; p.length = pack_ToDo (local->todo, p.record, 0xffff); return p; @@ -382,9 +411,7 @@ local_record_from_comp (EToDoLocalRecord *local, CalComponent *comp, EToDoCondui local->todo = g_new0 (struct ToDo,1); - /* Handle the fields and category we don't sync by making sure - * we don't overwrite them - */ + /* Don't overwrite the category */ if (local->local.ID != 0) { char record[0xffff]; int cat = 0; @@ -394,7 +421,6 @@ local_record_from_comp (EToDoLocalRecord *local, CalComponent *comp, EToDoCondui local->local.ID, &record, NULL, NULL, NULL, &cat) > 0) { local->local.category = cat; - unpack_ToDo (local->todo, record, 0xffff); } } @@ -475,14 +501,18 @@ local_record_from_uid (EToDoLocalRecord *local, if (status == CAL_CLIENT_GET_SUCCESS) { local_record_from_comp (local, comp, ctxt); + gtk_object_unref (GTK_OBJECT (comp)); } else if (status == CAL_CLIENT_GET_NOT_FOUND) { comp = cal_component_new (); cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO); cal_component_set_uid (comp, uid); local_record_from_comp (local, comp, ctxt); + gtk_object_unref (GTK_OBJECT (comp)); } else { INFO ("Object did not exist"); - } + } + + } @@ -670,10 +700,6 @@ pre_sync (GnomePilotConduit *conduit, return -1; LOG (" Using timezone: %s", icaltimezone_get_tzid (ctxt->timezone)); - /* Set the default timezone on the backend. */ - if (ctxt->timezone) - cal_client_set_default_timezone (ctxt->client, ctxt->timezone); - /* Load the uid <--> pilot id map */ filename = map_name (ctxt); e_pilot_map_read (filename, &ctxt->map); @@ -686,7 +712,8 @@ pre_sync (GnomePilotConduit *conduit, change_id = g_strdup_printf ("pilot-sync-evolution-todo-%d", ctxt->cfg->pilot_id); ctxt->changed = cal_client_get_changes (ctxt->client, CALOBJ_TYPE_TODO, change_id); ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal); - + g_free (change_id); + for (l = ctxt->changed; l != NULL; l = l->next) { CalClientChange *ccc = l->data; const char *uid; @@ -756,7 +783,8 @@ post_sync (GnomePilotConduit *conduit, change_id = g_strdup_printf ("pilot-sync-evolution-todo-%d", ctxt->cfg->pilot_id); changed = cal_client_get_changes (ctxt->client, CALOBJ_TYPE_TODO, change_id); cal_client_change_list_free (changed); - + g_free (change_id); + LOG ("---------------------------------------------------------\n"); return 0; @@ -814,7 +842,8 @@ for_each (GnomePilotConduitSyncAbs *conduit, *local = g_new0 (EToDoLocalRecord, 1); local_record_from_uid (*local, uids->data, ctxt); - + g_list_prepend (ctxt->locals, *local); + iterator = uids; } else { LOG ("no events"); @@ -828,6 +857,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, *local = g_new0 (EToDoLocalRecord, 1); local_record_from_uid (*local, iterator->data, ctxt); + g_list_prepend (ctxt->locals, *local); } else { LOG ("for_each ending"); @@ -866,6 +896,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, *local = g_new0 (EToDoLocalRecord, 1); local_record_from_comp (*local, ccc->comp, ctxt); + g_list_prepend (ctxt->locals, *local); } else { LOG ("no events"); @@ -878,7 +909,8 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, CalClientChange *ccc = iterator->data; *local = g_new0 (EToDoLocalRecord, 1); - local_record_from_comp (*local, ccc->comp, ctxt); + local_record_from_comp (*local, ccc->comp, ctxt); + g_list_prepend (ctxt->locals, *local); } else { LOG ("for_each_modified ending"); @@ -1041,8 +1073,7 @@ free_match (GnomePilotConduitSyncAbs *conduit, g_return_val_if_fail (local != NULL, -1); - gtk_object_unref (GTK_OBJECT (local->comp)); - g_free (local); + free_local (local); return 0; } diff --git a/calendar/conduits/todo/todo-conduit.h b/calendar/conduits/todo/todo-conduit.h index 8e365ce78f..28f370fc98 100644 --- a/calendar/conduits/todo/todo-conduit.h +++ b/calendar/conduits/todo/todo-conduit.h @@ -61,21 +61,14 @@ struct _EToDoConduitContext { struct ToDoAppInfo ai; CalClient *client; - char *calendar_file; - gboolean calendar_open_success; icaltimezone *timezone; GList *uids; GList *changed; GHashTable *changed_hash; + GList *locals; EPilotMap *map; }; #endif /* __TODO_CONDUIT_H__ */ - - - - - - diff --git a/calendar/gui/Evolution-Composer.h b/calendar/gui/Evolution-Composer.h deleted file mode 100644 index bd61419d04..0000000000 --- a/calendar/gui/Evolution-Composer.h +++ /dev/null @@ -1,352 +0,0 @@ -/* - * This file was generated by orbit-idl - DO NOT EDIT! - */ - -#include -#define ORBIT_IDL_SERIAL 9 -#include - -#ifndef Evolution_Composer_H -#define Evolution_Composer_H 1 -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -/** typedefs **/ -#include -#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(_GNOME_Evolution_Composer_Recipient_defined) -#define _GNOME_Evolution_Composer_Recipient_defined 1 - typedef struct - { - CORBA_char *name; - CORBA_char *address; - } - GNOME_Evolution_Composer_Recipient; - -#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_GNOME_Evolution_Composer_Recipient_struct; -#define TC_GNOME_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_Recipient_struct) -#endif - 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_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; - GNOME_Evolution_Composer_Recipient *_buffer; - CORBA_boolean _release; - } - 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_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_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(_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_GNOME_Evolution_Composer_RecipientList_struct; -#define TC_GNOME_Evolution_Composer_RecipientList ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_RecipientList_struct) -#endif - 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_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; - } - GNOME_Evolution_Composer_CouldNotParse; - -#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_GNOME_Evolution_Composer_CouldNotParse_struct; -#define TC_GNOME_Evolution_Composer_CouldNotParse ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_CouldNotParse_struct) -#endif -#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 (*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_GNOME_Evolution_Composer__epv; - typedef struct - { - PortableServer_ServantBase__epv *_base_epv; - POA_Bonobo_Unknown__epv *Bonobo_Unknown_epv; - POA_GNOME_Evolution_Composer__epv *GNOME_Evolution_Composer_epv; - } - POA_GNOME_Evolution_Composer__vepv; - typedef struct - { - void *_private; - POA_GNOME_Evolution_Composer__vepv *vepv; - } - 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 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_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 */ - -#endif -#undef ORBIT_IDL_SERIAL -- cgit v1.2.3