From 3d3cfc1137a698a43d6a0137a2924f5933b12f17 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 10 Nov 2000 20:41:13 +0000 Subject: A very, long, very tedious IDL API rename and re-scoping; this script + some grunt approximates the work: s/Evolution_MessageList/GNOME_Evolution_MessageList/g; s/GNOME_Evolution_MessageList_select_message/GNOME_Evolution_MessageList_selectMessage/g; s/GNOME_Evolution_MessageList_open_message/GNOME_Evolution_MessageList_openMessage/g; s/Evolution_Folder([ \t])/GNOME_Evolution_Folder$1/g; s/Evolution_FolderTypeList/GNOME_Evolution_FolderTypeList/g; s/Evolution_FolderBrowser/GNOME_Evolution_FolderBrowser/g; s/GNOME_Evolution_FolderBrowser_get_message_list/GNOME_Evolution_FolderBrowser_getMessageList/g; s/Evolution_LocalStorage/GNOME_Evolution_LocalStorage/g; s/GNOME_Evolution_LocalStorage_update_folder/GNOME_Evolution_LocalStorage_updateFolder/g; s/Evolution_ShellView/GNOME_Evolution_ShellView/g; s/GNOME_Evolution_ShellView_set_message/GNOME_Evolution_ShellView_setMessage/g; s/GNOME_Evolution_ShellView_unset_message/GNOME_Evolution_ShellView_unsetMessage/g; s/GNOME_Evolution_ShellView_change_current_view/GNOME_Evolution_ShellView_changeCurrentView/g; s/Evolution_StorageSetViewListener/GNOME_Evolution_StorageSetViewListener/g; s/GNOME_Evolution_StorageSetViewListener_folder_selected/GNOME_Evolution_StorageSetViewListener_notifyFolderSelected/g; s/GNOME_Evolution_StorageSetViewListener_storage_selected/GNOME_Evolution_StorageSetViewListener_notifyStorageSelected/g; s/Evolution_StorageSetView/GNOME_Evolution_StorageSetView/g; s/GNOME_Evolution_StorageSetView_add_listener/GNOME_Evolution_StorageSetView_addListener/g; s/GNOME_Evolution_StorageSetView_remove_listener/GNOME_Evolution_StorageSetView_removeListener/g; s/Evolution_Shell/GNOME_Evolution_Shell/g; s/GNOME_Evolution_Shell_get_component_for_type/GNOME_Evolution_Shell_getComponentByType/g; s/GNOME_Evolution_Shell_user_select_folder/GNOME_Evolution_Shell_selectUserFolder/g; s/GNOME_Evolution_Shell_get_local_storage/GNOME_Evolution_Shell_getLocalStorage/g; s/GNOME_Evolution_Shell_create_storage_set_view/GNOME_Evolution_Shell_createStorageSetView/g; s/Evolution_FolderSelectionListener/GNOME_Evolution_FolderSelectionListener/g; s/GNOME_Evolution_FolderSelectionListener_selected/GNOME_Evolution_FolderSelectionListener_notifySelected/g; s/GNOME_Evolution_FolderSelectionListener_cancel/GNOME_Evolution_FolderSelectionListener_notifyCanceled/g; s/Evolution_Storage/GNOME_Evolution_Storage/g; s/GNOME_Evolution_Storage_add_listener/GNOME_Evolution_Storage_addListener/g; s/GNOME_Evolution_Storage_remove_listener/GNOME_Evolution_Storage_removeListener/g; s/GNOME_Evolution_StorageListener_destroyed/GNOME_Evolution_StorageListener_notifyDestroyed/g; s/GNOME_Evolution_StorageListener_new_folder/GNOME_Evolution_StorageListener_notifyFolderCreated/g; s/GNOME_Evolution_StorageListener_update_folder/GNOME_Evolution_StorageListener_notifyFolderUpdated/g; s/GNOME_Evolution_StorageListener_removed_folder/GNOME_Evolution_StorageListener_notifyFolderRemoved/g; s/GNOME_Evolution_StorageRegistry_register_storage/GNOME_Evolution_StorageRegistry_addStorage/g; s/GNOME_Evolution_StorageRegistry_unregister_storage/GNOME_Evolution_StorageRegistry_removeStorageByName/g; s/Evolution_ShellComponent/GNOME_Evolution_ShellComponent/g; s/GNOME_Evolution_ShellComponent_set_owner/GNOME_Evolution_ShellComponent_setOwner/g; s/GNOME_Evolution_ShellComponent_unset_owner/GNOME_Evolution_ShellComponent_unsetOwner/g; s/GNOME_Evolution_ShellComponent_create_view/GNOME_Evolution_ShellComponent_createView/g; s/GNOME_Evolution_ShellComponent_async_create_folder/GNOME_Evolution_ShellComponent_addFolderAsync/g; s/GNOME_Evolution_ShellComponent_async_remove_folder/GNOME_Evolution_ShellComponent_removeFolderAsync/g; s/GNOME_Evolution_ShellComponent_populate_folder_context_menu/GNOME_Evolution_ShellComponent_populateFolderContextMenu/g; s/GNOME_Evolution_ShellComponentListener_report_result/GNOME_Evolution_ShellComponentListener_notifyResult/g; s/Evolution_Session/GNOME_Evolution_Session/g; s/GNOME_Evolution_Session_save_configuration/GNOME_Evolution_Session_saveConfiguration/g; s/GNOME_Evolution_Session_load_configuration/GNOME_Evolution_Session_loadConfiguration/g; s/Evolution_Calendar_Cal/GNOME_Evolution_Calendar_Cal/g; s/GNOME_Evolution_Calendar_Cal_get_n_objects/GNOME_Evolution_Calendar_Cal_countObjects/g; s/GNOME_Evolution_Calendar_Cal_get_object/GNOME_Evolution_Calendar_Cal_getObject/g; s/GNOME_Evolution_Calendar_Cal_get_uids/GNOME_Evolution_Calendar_Cal_getUIds/g; s/GNOME_Evolution_Calendar_Cal_get_changed_uids/GNOME_Evolution_Calendar_Cal_getChangedUIds/g; s/GNOME_Evolution_Calendar_Cal_get_objects_in_range/GNOME_Evolution_Calendar_Cal_getObjectsInRange/g; s/GNOME_Evolution_Calendar_Cal_get_alarms_in_range/GNOME_Evolution_Calendar_Cal_getAlarmsInRange/g; s/GNOME_Evolution_Calendar_Cal_get_alarms_for_object/GNOME_Evolution_Calendar_Cal_getAlarmsForObject/g; s/GNOME_Evolution_Calendar_Cal_update_object/GNOME_Evolution_Calendar_Cal_updateObject/g; s/GNOME_Evolution_Calendar_Cal_remove_object/GNOME_Evolution_Calendar_Cal_removeObject/g; s/Evolution_Calendar_Listener/GNOME_Evolution_Calendar_Listener/g; s/GNOME_Evolution_Calendar_Listener_cal_loaded/GNOME_Evolution_Calendar_Listener_notifyCalLoaded/g; s/GNOME_Evolution_Calendar_Listener_obj_updated/GNOME_Evolution_Calendar_Listener_notifyObjUpdated/g; s/GNOME_Evolution_Calendar_Listener_obj_removed/GNOME_Evolution_Calendar_Listener_notifyObjRemoved/g; s/Evolution_Calendar_CalFactory/GNOME_Evolution_Calendar_CalFactory/g; s/GNOME_Evolution_Calendar_CalFactory_load/GNOME_Evolution_Calendar_CalFactory_load/g; s/GNOME_Evolution_Calendar_CalFactory_create/GNOME_Evolution_Calendar_CalFactory_create/g; s/Evolution_Composer/GNOME_Evolution_Composer/g; s/GNOME_Evolution_Composer_set_headers/GNOME_Evolution_Composer_setHeaders/g; s/GNOME_Evolution_Composer_set_body_text/GNOME_Evolution_Composer_setBodyText/g; s/GNOME_Evolution_Composer_attach_MIME/GNOME_Evolution_Composer_attachMIME/g; s/GNOME_Evolution_Composer_attach_data/GNOME_Evolution_Composer_attachData/g; s/GNOME_Evolution_Composer_show/GNOME_Evolution_Composer_show/g; s/Evolution_Addressbook_SelectNames/GNOME_Evolution_Addressbook_SelectNames/g; s/GNOME_Evolution_Addressbook_SelectNames_add_section/GNOME_Evolution_Addressbook_SelectNames_addSection/g; s/GNOME_Evolution_Addressbook_SelectNames_get_entry_for_section/GNOME_Evolution_Addressbook_SelectNames_getEntryBySection/g; s/GNOME_Evolution_Addressbook_SelectNames_activate_dialog/GNOME_Evolution_Addressbook_SelectNames_activateDialog/g; s/Evolution_CardCursor/GNOME_Evolution_Addressbook_CardCursor/g; s/GNOME_Evolution_Addressbook_CardCursor_get_length/GNOME_Evolution_Addressbook_CardCursor_getLength/g; s/GNOME_Evolution_Addressbook_CardCursor_get_nth/GNOME_Evolution_Addressbook_CardCursor_getNth/g; s/Evolution_BookViewListener/GNOME_Evolution_Addressbook_BookViewListener/g; s/GNOME_Evolution_Addressbook_BookViewListener_signal_card_added/GNOME_Evolution_Addressbook_BookViewListener_notifyCardAdded/g; s/GNOME_Evolution_Addressbook_BookViewListener_signal_card_removed/GNOME_Evolution_Addressbook_BookViewListener_notifyCardRemoved/g; s/GNOME_Evolution_Addressbook_BookViewListener_signal_card_changed/GNOME_Evolution_Addressbook_BookViewListener_notifyCardChanged/g; s/GNOME_Evolution_Addressbook_BookViewListener_signal_sequence_complete/GNOME_Evolution_Addressbook_BookViewListener_notifySequenceComplete/g; s/GNOME_Evolution_Addressbook_BookViewListener_signal_status_message/GNOME_Evolution_Addressbook_BookViewListener_notifyStatusMessage/g; s/Evolution_BookView/GNOME_Evolution_Addressbook_BookView/g; s/Evolution_Book/GNOME_Evolution_Addressbook_Book/g; s/GNOME_Evolution_Addressbook_Book_get_vcard/GNOME_Evolution_Addressbook_Book_getVCard/g; s/GNOME_Evolution_Addressbook_Book_can_write/GNOME_Evolution_Addressbook_Book_isWriteable/g; s/GNOME_Evolution_Addressbook_Book_can_write_card/GNOME_Evolution_Addressbook_Book_isCardWriteable/g; s/GNOME_Evolution_Addressbook_Book_create_card/GNOME_Evolution_Addressbook_Book_addCard/g; s/GNOME_Evolution_Addressbook_Book_remove_card/GNOME_Evolution_Addressbook_Book_removeCard/g; s/GNOME_Evolution_Addressbook_Book_modify_card/GNOME_Evolution_Addressbook_Book_modifyCard/g; s/GNOME_Evolution_Addressbook_Book_get_cursor/GNOME_Evolution_Addressbook_Book_getCursor/g; s/GNOME_Evolution_Addressbook_Book_get_book_view/GNOME_Evolution_Addressbook_Book_getBookView/g; s/GNOME_Evolution_Addressbook_Book_get_changes/GNOME_Evolution_Addressbook_Book_getChanges/g; s/GNOME_Evolution_Addressbook_Book_check_connection/GNOME_Evolution_Addressbook_Book_checkConnection/g; s/GNOME_Evolution_Addressbook_Book_get_static_capabilities/GNOME_Evolution_Addressbook_Book_getStaticCapabilities/g; s/GNOME_Evolution_Addressbook_Book_get_name/GNOME_Evolution_Addressbook_Book_getName/g; s/Evolution_BookListener/GNOME_Evolution_Addressbook_BookListener/g; s/GNOME_Evolution_Addressbook_BookListener_respond_create_card/GNOME_Evolution_Addressbook_BookListener_notifyCardCreated/g; s/GNOME_Evolution_Addressbook_BookListener_respond_remove_card/GNOME_Evolution_Addressbook_BookListener_notifyCardRemoved/g; s/GNOME_Evolution_Addressbook_BookListener_respond_modify_card/GNOME_Evolution_Addressbook_BookListener_notifyCardModified/g; s/GNOME_Evolution_Addressbook_BookListener_report_open_book_progress/GNOME_Evolution_Addressbook_BookListener_notifyOpenBookProgress/g; s/GNOME_Evolution_Addressbook_BookListener_respond_open_book/GNOME_Evolution_Addressbook_BookListener_notifyBookOpened/g; s/GNOME_Evolution_Addressbook_BookListener_respond_get_cursor/GNOME_Evolution_Addressbook_BookListener_notifyCursorRequested/g; s/GNOME_Evolution_Addressbook_BookListener_respond_get_view/GNOME_Evolution_Addressbook_BookListener_notifyViewRequested/g; s/GNOME_Evolution_Addressbook_BookListener_respond_get_changes/GNOME_Evolution_Addressbook_BookListener_notifyChangesRequested/g; s/GNOME_Evolution_Addressbook_BookListener_report_connection_status/GNOME_Evolution_Addressbook_BookListener_notifyConnectionStatus/g; s/Evolution_BookFactory/GNOME_Evolution_Addressbook_BookFactory/g; s/GNOME_Evolution_Addressbook_BookFactory_open_book/GNOME_Evolution_Addressbook_BookFactory_openBook/g; s/Evolution_SummaryComponent/GNOME_Evolution_Summary_Component/g; s/GNOME_Evolution_Summary_SummaryComponent_set_owner/GNOME_Evolution_Summary_Component_setOwner/g; s/GNOME_Evolution_Summary_SummaryComponent_unset_owner/GNOME_Evolution_Summary_Component_unsetOwner/g; s/GNOME_Evolution_Summary_SummaryComponent_create_view/GNOME_Evolution_Summary_Component_createView/g; s/GNOME_Evolution_Summary_SummaryComponent_destroy_view/GNOME_Evolution_Summary_Component_destroyView/g; s/Evolution_Summary([ \t])/GNOME_Evolution_Summary_ViewFrame$1/g; s/Evolution_Summary_set_title/GNOME_Evolution_Summary_ViewFrame_setTitle/g; s/Evolution_Summary_set_icon/GNOME_Evolution_Summary_ViewFrame_setIcon/g; s/Evolution_Summary_update_component/GNOME_Evolution_Summary_ViewFrame_updateComponent/g; s/GNOME_GNOME/GNOME/g; s/GNOME_GNOME/GNOME/g; s/GNOME_GNOME/GNOME/g; svn path=/trunk/; revision=6535 --- calendar/pcs/cal.c | 160 ++++++++++++++++++++++++++--------------------------- 1 file changed, 80 insertions(+), 80 deletions(-) (limited to 'calendar/pcs/cal.c') diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c index 35d98abd64..8383d135fb 100644 --- a/calendar/pcs/cal.c +++ b/calendar/pcs/cal.c @@ -31,7 +31,7 @@ struct _CalPrivate { CalBackend *backend; /* Listener on the client we notify */ - Evolution_Calendar_Listener listener; + GNOME_Evolution_Calendar_Listener listener; }; @@ -40,7 +40,7 @@ static void cal_class_init (CalClass *class); static void cal_init (Cal *cal); static void cal_destroy (GtkObject *object); -static POA_Evolution_Calendar_Cal__vepv cal_vepv; +static POA_GNOME_Evolution_Calendar_Cal__vepv cal_vepv; static BonoboObjectClass *parent_class; @@ -83,7 +83,7 @@ static void init_cal_corba_class (void) { cal_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv (); - cal_vepv.Evolution_Calendar_Cal_epv = cal_get_epv (); + cal_vepv.GNOME_Evolution_Calendar_Cal_epv = cal_get_epv (); } /* Class initialization function for the calendar */ @@ -172,17 +172,17 @@ Cal_get_uri (PortableServer_Servant servant, * representation. */ static CalObjType -uncorba_obj_type (Evolution_Calendar_CalObjType type) +uncorba_obj_type (GNOME_Evolution_Calendar_CalObjType type) { - return (((type & Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0) - | ((type & Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0) - | ((type & Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0)); + return (((type & GNOME_Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0) + | ((type & GNOME_Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0) + | ((type & GNOME_Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0)); } /* Cal::get_n_objects method */ static CORBA_long Cal_get_n_objects (PortableServer_Servant servant, - Evolution_Calendar_CalObjType type, + GNOME_Evolution_Calendar_CalObjType type, CORBA_Environment *ev) { Cal *cal; @@ -199,9 +199,9 @@ Cal_get_n_objects (PortableServer_Servant servant, } /* Cal::get_object method */ -static Evolution_Calendar_CalObj +static GNOME_Evolution_Calendar_CalObj Cal_get_object (PortableServer_Servant servant, - const Evolution_Calendar_CalObjUID uid, + const GNOME_Evolution_Calendar_CalObjUID uid, CORBA_Environment *ev) { Cal *cal; @@ -221,25 +221,25 @@ Cal_get_object (PortableServer_Servant servant, return calobj_copy; } else { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_Calendar_Cal_NotFound, + ex_GNOME_Evolution_Calendar_Cal_NotFound, NULL); return NULL; } } -static Evolution_Calendar_CalObjUIDSeq * +static GNOME_Evolution_Calendar_CalObjUIDSeq * build_uid_seq (GList *uids) { - Evolution_Calendar_CalObjUIDSeq *seq; + GNOME_Evolution_Calendar_CalObjUIDSeq *seq; GList *l; int n, i; n = g_list_length (uids); - seq = Evolution_Calendar_CalObjUIDSeq__alloc (); + seq = GNOME_Evolution_Calendar_CalObjUIDSeq__alloc (); CORBA_sequence_set_release (seq, TRUE); seq->_length = n; - seq->_buffer = CORBA_sequence_Evolution_Calendar_CalObjUID_allocbuf (n); + seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObjUID_allocbuf (n); /* Fill the sequence */ @@ -254,15 +254,15 @@ build_uid_seq (GList *uids) } /* Cal::get_uids method */ -static Evolution_Calendar_CalObjUIDSeq * +static GNOME_Evolution_Calendar_CalObjUIDSeq * Cal_get_uids (PortableServer_Servant servant, - Evolution_Calendar_CalObjType type, + GNOME_Evolution_Calendar_CalObjType type, CORBA_Environment *ev) { Cal *cal; CalPrivate *priv; GList *uids; - Evolution_Calendar_CalObjUIDSeq *seq; + GNOME_Evolution_Calendar_CalObjUIDSeq *seq; int t; cal = CAL (bonobo_object_from_servant (servant)); @@ -278,24 +278,24 @@ Cal_get_uids (PortableServer_Servant servant, return seq; } -static Evolution_Calendar_CalObjChangeSeq * +static GNOME_Evolution_Calendar_CalObjChangeSeq * build_change_seq (GList *changes) { GList *l; int n, i; - Evolution_Calendar_CalObjChangeSeq *seq; + GNOME_Evolution_Calendar_CalObjChangeSeq *seq; n = g_list_length (changes); - seq = Evolution_Calendar_CalObjChangeSeq__alloc (); + seq = GNOME_Evolution_Calendar_CalObjChangeSeq__alloc (); CORBA_sequence_set_release (seq, TRUE); seq->_length = n; - seq->_buffer = CORBA_sequence_Evolution_Calendar_CalObjChange_allocbuf (n); + seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObjChange_allocbuf (n); /* Fill the sequence */ for (i = 0, l = changes; l; i++, l = l->next) { CalObjChange *c; - Evolution_Calendar_CalObjChange *corba_c; + GNOME_Evolution_Calendar_CalObjChange *corba_c; c = l->data; corba_c = &seq->_buffer[i]; @@ -308,16 +308,16 @@ build_change_seq (GList *changes) } /* Cal::get_changed_uids method */ -static Evolution_Calendar_CalObjChangeSeq * +static GNOME_Evolution_Calendar_CalObjChangeSeq * Cal_get_changed_uids (PortableServer_Servant servant, - Evolution_Calendar_CalObjType type, - Evolution_Calendar_Time_t since, + GNOME_Evolution_Calendar_CalObjType type, + GNOME_Evolution_Calendar_Time_t since, CORBA_Environment *ev) { Cal *cal; CalPrivate *priv; GList *changes; - Evolution_Calendar_CalObjChangeSeq *seq; + GNOME_Evolution_Calendar_CalObjChangeSeq *seq; int t; time_t s; @@ -336,18 +336,18 @@ Cal_get_changed_uids (PortableServer_Servant servant, } /* Cal::get_objects_in_range method */ -static Evolution_Calendar_CalObjUIDSeq * +static GNOME_Evolution_Calendar_CalObjUIDSeq * Cal_get_objects_in_range (PortableServer_Servant servant, - Evolution_Calendar_CalObjType type, - Evolution_Calendar_Time_t start, - Evolution_Calendar_Time_t end, + GNOME_Evolution_Calendar_CalObjType type, + GNOME_Evolution_Calendar_Time_t start, + GNOME_Evolution_Calendar_Time_t end, CORBA_Environment *ev) { Cal *cal; CalPrivate *priv; int t; time_t t_start, t_end; - Evolution_Calendar_CalObjUIDSeq *seq; + GNOME_Evolution_Calendar_CalObjUIDSeq *seq; GList *uids; cal = CAL (bonobo_object_from_servant (servant)); @@ -359,7 +359,7 @@ Cal_get_objects_in_range (PortableServer_Servant servant, if (t_start > t_end || t_start == -1 || t_end == -1) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_Calendar_Cal_InvalidRange, + ex_GNOME_Evolution_Calendar_Cal_InvalidRange, NULL); return NULL; } @@ -398,25 +398,25 @@ corba_alarm_type (enum AlarmType type) #endif /* Builds a CORBA sequence of alarm instances from a CalAlarmInstance list. */ -static Evolution_Calendar_CalAlarmInstanceSeq * +static GNOME_Evolution_Calendar_CalAlarmInstanceSeq * build_alarm_instance_seq (GList *alarms) { GList *l; int n, i; - Evolution_Calendar_CalAlarmInstanceSeq *seq; + GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq; n = g_list_length (alarms); - seq = Evolution_Calendar_CalAlarmInstanceSeq__alloc (); + seq = GNOME_Evolution_Calendar_CalAlarmInstanceSeq__alloc (); CORBA_sequence_set_release (seq, TRUE); seq->_length = n; - seq->_buffer = CORBA_sequence_Evolution_Calendar_CalAlarmInstance_allocbuf (n); + seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalAlarmInstance_allocbuf (n); /* Fill the sequence */ for (i = 0, l = alarms; l; i++, l = l->next) { CalAlarmInstance *ai; - Evolution_Calendar_CalAlarmInstance *corba_ai; + GNOME_Evolution_Calendar_CalAlarmInstance *corba_ai; ai = l->data; corba_ai = &seq->_buffer[i]; @@ -433,16 +433,16 @@ build_alarm_instance_seq (GList *alarms) } /* Cal::get_alarms_in_range method */ -static Evolution_Calendar_CalAlarmInstanceSeq * +static GNOME_Evolution_Calendar_CalAlarmInstanceSeq * Cal_get_alarms_in_range (PortableServer_Servant servant, - Evolution_Calendar_Time_t start, - Evolution_Calendar_Time_t end, + GNOME_Evolution_Calendar_Time_t start, + GNOME_Evolution_Calendar_Time_t end, CORBA_Environment *ev) { Cal *cal; CalPrivate *priv; time_t t_start, t_end; - Evolution_Calendar_CalAlarmInstanceSeq *seq; + GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq; GList *alarms; cal = CAL (bonobo_object_from_servant (servant)); @@ -453,7 +453,7 @@ Cal_get_alarms_in_range (PortableServer_Servant servant, if (t_start > t_end || t_start == -1 || t_end == -1) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_Calendar_Cal_InvalidRange, + ex_GNOME_Evolution_Calendar_Cal_InvalidRange, NULL); return NULL; } @@ -468,17 +468,17 @@ Cal_get_alarms_in_range (PortableServer_Servant servant, } /* Cal::get_alarms_for_object method */ -static Evolution_Calendar_CalAlarmInstanceSeq * +static GNOME_Evolution_Calendar_CalAlarmInstanceSeq * Cal_get_alarms_for_object (PortableServer_Servant servant, - const Evolution_Calendar_CalObjUID uid, - Evolution_Calendar_Time_t start, - Evolution_Calendar_Time_t end, + const GNOME_Evolution_Calendar_CalObjUID uid, + GNOME_Evolution_Calendar_Time_t start, + GNOME_Evolution_Calendar_Time_t end, CORBA_Environment *ev) { Cal *cal; CalPrivate *priv; time_t t_start, t_end; - Evolution_Calendar_CalAlarmInstanceSeq *seq; + GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq; GList *alarms; gboolean result; @@ -490,7 +490,7 @@ Cal_get_alarms_for_object (PortableServer_Servant servant, if (t_start > t_end || t_start == -1 || t_end == -1) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_Calendar_Cal_InvalidRange, + ex_GNOME_Evolution_Calendar_Cal_InvalidRange, NULL); return NULL; } @@ -498,7 +498,7 @@ Cal_get_alarms_for_object (PortableServer_Servant servant, result = cal_backend_get_alarms_for_object (priv->backend, uid, t_start, t_end, &alarms); if (!result) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_Calendar_Cal_NotFound, + ex_GNOME_Evolution_Calendar_Cal_NotFound, NULL); return NULL; } @@ -512,8 +512,8 @@ Cal_get_alarms_for_object (PortableServer_Servant servant, /* Cal::update_object method */ static void Cal_update_object (PortableServer_Servant servant, - const Evolution_Calendar_CalObjUID uid, - const Evolution_Calendar_CalObj calobj, + const GNOME_Evolution_Calendar_CalObjUID uid, + const GNOME_Evolution_Calendar_CalObj calobj, CORBA_Environment *ev) { Cal *cal; @@ -524,14 +524,14 @@ Cal_update_object (PortableServer_Servant servant, if (!cal_backend_update_object (priv->backend, uid, calobj)) CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_Calendar_Cal_InvalidObject, + ex_GNOME_Evolution_Calendar_Cal_InvalidObject, NULL); } /* Cal::remove_object method */ static void Cal_remove_object (PortableServer_Servant servant, - const Evolution_Calendar_CalObjUID uid, + const GNOME_Evolution_Calendar_CalObjUID uid, CORBA_Environment *ev) { Cal *cal; @@ -542,7 +542,7 @@ Cal_remove_object (PortableServer_Servant servant, if (!cal_backend_remove_object (priv->backend, uid)) CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_Calendar_Cal_NotFound, + ex_GNOME_Evolution_Calendar_Cal_NotFound, NULL); } @@ -554,22 +554,22 @@ Cal_remove_object (PortableServer_Servant servant, * * Return value: A newly-allocated EPV. **/ -POA_Evolution_Calendar_Cal__epv * +POA_GNOME_Evolution_Calendar_Cal__epv * cal_get_epv (void) { - POA_Evolution_Calendar_Cal__epv *epv; - - epv = g_new0 (POA_Evolution_Calendar_Cal__epv, 1); - epv->_get_uri = Cal_get_uri; - epv->get_n_objects = Cal_get_n_objects; - epv->get_object = Cal_get_object; - epv->get_uids = Cal_get_uids; - epv->get_changed_uids = Cal_get_changed_uids; - epv->get_objects_in_range = Cal_get_objects_in_range; - epv->get_alarms_in_range = Cal_get_alarms_in_range; - epv->get_alarms_for_object = Cal_get_alarms_for_object; - epv->update_object = Cal_update_object; - epv->remove_object = Cal_remove_object; + POA_GNOME_Evolution_Calendar_Cal__epv *epv; + + epv = g_new0 (POA_GNOME_Evolution_Calendar_Cal__epv, 1); + epv->_get_uri = Cal_get_uri; + epv->countObjects = Cal_get_n_objects; + epv->getObject = Cal_get_object; + epv->getUIds = Cal_get_uids; + epv->getChangedUIds = Cal_get_changed_uids; + epv->getObjectsInRange = Cal_get_objects_in_range; + epv->getAlarmsInRange = Cal_get_alarms_in_range; + epv->getAlarmsForObject = Cal_get_alarms_for_object; + epv->updateObject = Cal_update_object; + epv->removeObject = Cal_remove_object; return epv; } @@ -591,9 +591,9 @@ cal_get_epv (void) **/ Cal * cal_construct (Cal *cal, - Evolution_Calendar_Cal corba_cal, + GNOME_Evolution_Calendar_Cal corba_cal, CalBackend *backend, - Evolution_Calendar_Listener listener) + GNOME_Evolution_Calendar_Listener listener) { CalPrivate *priv; CORBA_Environment ev; @@ -632,20 +632,20 @@ cal_construct (Cal *cal, * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of * failure. **/ -Evolution_Calendar_Cal +GNOME_Evolution_Calendar_Cal cal_corba_object_create (BonoboObject *object) { - POA_Evolution_Calendar_Cal *servant; + POA_GNOME_Evolution_Calendar_Cal *servant; CORBA_Environment ev; g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL); g_return_val_if_fail (IS_CAL (object), CORBA_OBJECT_NIL); - servant = (POA_Evolution_Calendar_Cal *) g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_Calendar_Cal *) g_new0 (BonoboObjectServant, 1); servant->vepv = &cal_vepv; CORBA_exception_init (&ev); - POA_Evolution_Calendar_Cal__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_Calendar_Cal__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_message ("cal_corba_object_create(): could not init the servant"); g_free (servant); @@ -654,7 +654,7 @@ cal_corba_object_create (BonoboObject *object) } CORBA_exception_free (&ev); - return (Evolution_Calendar_Cal) bonobo_object_activate_servant (object, servant); + return (GNOME_Evolution_Calendar_Cal) bonobo_object_activate_servant (object, servant); } /** @@ -669,10 +669,10 @@ cal_corba_object_create (BonoboObject *object) * if its corresponding CORBA object could not be created. **/ Cal * -cal_new (CalBackend *backend, Evolution_Calendar_Listener listener) +cal_new (CalBackend *backend, GNOME_Evolution_Calendar_Listener listener) { Cal *cal, *retval; - Evolution_Calendar_Cal corba_cal; + GNOME_Evolution_Calendar_Cal corba_cal; CORBA_Environment ev; gboolean ret; @@ -725,7 +725,7 @@ cal_notify_update (Cal *cal, const char *uid) g_return_if_fail (priv->listener != CORBA_OBJECT_NIL); CORBA_exception_init (&ev); - Evolution_Calendar_Listener_obj_updated (priv->listener, (char *) uid, &ev); + GNOME_Evolution_Calendar_Listener_notifyObjUpdated (priv->listener, (char *) uid, &ev); if (ev._major != CORBA_NO_EXCEPTION) g_message ("cal_notify_update(): could not notify the listener " @@ -756,7 +756,7 @@ cal_notify_remove (Cal *cal, const char *uid) g_return_if_fail (priv->listener != CORBA_OBJECT_NIL); CORBA_exception_init (&ev); - Evolution_Calendar_Listener_obj_removed (priv->listener, (char *) uid, &ev); + GNOME_Evolution_Calendar_Listener_notifyObjRemoved (priv->listener, (char *) uid, &ev); if (ev._major != CORBA_NO_EXCEPTION) g_message ("cal_notify_remove(): could not notify the listener " -- cgit