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 --- addressbook/backend/pas/pas-book.c | 124 ++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 62 deletions(-) (limited to 'addressbook/backend/pas/pas-book.c') diff --git a/addressbook/backend/pas/pas-book.c b/addressbook/backend/pas/pas-book.c index b1d2688b3f..6fded8301d 100644 --- a/addressbook/backend/pas/pas-book.c +++ b/addressbook/backend/pas/pas-book.c @@ -10,7 +10,7 @@ #include "pas-book.h" static BonoboObjectClass *pas_book_parent_class; -POA_Evolution_Book__vepv pas_book_vepv; +POA_GNOME_Evolution_Addressbook_Book__vepv pas_book_vepv; enum { REQUESTS_QUEUED, @@ -21,7 +21,7 @@ static guint pas_book_signals [LAST_SIGNAL]; struct _PASBookPrivate { PASBackend *backend; - Evolution_BookListener listener; + GNOME_Evolution_Addressbook_BookListener listener; PASBookGetVCardFn get_vcard; PASBookCanWriteFn can_write; PASBookCanWriteCardFn can_write_card; @@ -106,7 +106,7 @@ pas_book_queue_get_cursor (PASBook *book, const char *search) } static void -pas_book_queue_get_book_view (PASBook *book, const Evolution_BookViewListener listener, const char *search) +pas_book_queue_get_book_view (PASBook *book, const GNOME_Evolution_Addressbook_BookViewListener listener, const char *search) { PASRequest *req; CORBA_Environment ev; @@ -130,7 +130,7 @@ pas_book_queue_get_book_view (PASBook *book, const Evolution_BookViewListener li } static void -pas_book_queue_get_changes (PASBook *book, const Evolution_BookViewListener listener, const char *change_id) +pas_book_queue_get_changes (PASBook *book, const GNOME_Evolution_Addressbook_BookViewListener listener, const char *change_id) { PASRequest *req; CORBA_Environment ev; @@ -165,9 +165,9 @@ pas_book_queue_check_connection (PASBook *book) } static CORBA_char * -impl_Evolution_Book_get_vcard (PortableServer_Servant servant, - const Evolution_CardId id, - CORBA_Environment *ev) +impl_GNOME_Evolution_Addressbook_Book_getVCard (PortableServer_Servant servant, + const GNOME_Evolution_Addressbook_CardId id, + CORBA_Environment *ev) { PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant)); char *vcard; @@ -181,7 +181,7 @@ impl_Evolution_Book_get_vcard (PortableServer_Servant servant, } static CORBA_boolean -impl_Evolution_Book_can_write (PortableServer_Servant servant, +impl_GNOME_Evolution_Addressbook_Book_isWriteable (PortableServer_Servant servant, CORBA_Environment *ev) { PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant)); @@ -193,9 +193,9 @@ impl_Evolution_Book_can_write (PortableServer_Servant servant, } static CORBA_boolean -impl_Evolution_Book_can_write_card (PortableServer_Servant servant, - const Evolution_CardId id, - CORBA_Environment *ev) +impl_GNOME_Evolution_Addressbook_Book_isCardWriteable (PortableServer_Servant servant, + const GNOME_Evolution_Addressbook_CardId id, + CORBA_Environment *ev) { PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant)); CORBA_boolean retval; @@ -206,8 +206,8 @@ impl_Evolution_Book_can_write_card (PortableServer_Servant servant, } static void -impl_Evolution_Book_create_card (PortableServer_Servant servant, - const Evolution_VCard vcard, +impl_GNOME_Evolution_Addressbook_Book_addCard (PortableServer_Servant servant, + const GNOME_Evolution_Addressbook_VCard vcard, CORBA_Environment *ev) { PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant)); @@ -216,8 +216,8 @@ impl_Evolution_Book_create_card (PortableServer_Servant servant, } static void -impl_Evolution_Book_remove_card (PortableServer_Servant servant, - const Evolution_CardId id, +impl_GNOME_Evolution_Addressbook_Book_removeCard (PortableServer_Servant servant, + const GNOME_Evolution_Addressbook_CardId id, CORBA_Environment *ev) { PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant)); @@ -226,8 +226,8 @@ impl_Evolution_Book_remove_card (PortableServer_Servant servant, } static void -impl_Evolution_Book_modify_card (PortableServer_Servant servant, - const Evolution_VCard vcard, +impl_GNOME_Evolution_Addressbook_Book_modifyCard (PortableServer_Servant servant, + const GNOME_Evolution_Addressbook_VCard vcard, CORBA_Environment *ev) { PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant)); @@ -236,7 +236,7 @@ impl_Evolution_Book_modify_card (PortableServer_Servant servant, } static void -impl_Evolution_Book_get_cursor (PortableServer_Servant servant, +impl_GNOME_Evolution_Addressbook_Book_getCursor (PortableServer_Servant servant, const CORBA_char *search, CORBA_Environment *ev) { @@ -246,8 +246,8 @@ impl_Evolution_Book_get_cursor (PortableServer_Servant servant, } static void -impl_Evolution_Book_get_book_view (PortableServer_Servant servant, - const Evolution_BookViewListener listener, +impl_GNOME_Evolution_Addressbook_Book_getBookView (PortableServer_Servant servant, + const GNOME_Evolution_Addressbook_BookViewListener listener, const CORBA_char *search, CORBA_Environment *ev) { @@ -257,8 +257,8 @@ impl_Evolution_Book_get_book_view (PortableServer_Servant servant, } static void -impl_Evolution_Book_get_changes (PortableServer_Servant servant, - const Evolution_BookViewListener listener, +impl_GNOME_Evolution_Addressbook_Book_getChanges (PortableServer_Servant servant, + const GNOME_Evolution_Addressbook_BookViewListener listener, const CORBA_char *change_id, CORBA_Environment *ev) { @@ -268,7 +268,7 @@ impl_Evolution_Book_get_changes (PortableServer_Servant servant, } static void -impl_Evolution_Book_check_connection (PortableServer_Servant servant, +impl_GNOME_Evolution_Addressbook_Book_checkConnection (PortableServer_Servant servant, CORBA_Environment *ev) { PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant)); @@ -277,7 +277,7 @@ impl_Evolution_Book_check_connection (PortableServer_Servant servant, } static char * -impl_Evolution_Book_get_static_capabilities (PortableServer_Servant servant, +impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities (PortableServer_Servant servant, CORBA_Environment *ev) { PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant)); @@ -305,7 +305,7 @@ pas_book_get_backend (PASBook *book) /** * pas_book_get_listener: */ -Evolution_BookListener +GNOME_Evolution_Addressbook_BookListener pas_book_get_listener (PASBook *book) { g_return_val_if_fail (book != NULL, CORBA_OBJECT_NIL); @@ -357,19 +357,19 @@ pas_book_pop_request (PASBook *book) */ void pas_book_respond_open (PASBook *book, - Evolution_BookListener_CallStatus status) + GNOME_Evolution_Addressbook_BookListener_CallStatus status) { CORBA_Environment ev; CORBA_exception_init (&ev); - if (status == Evolution_BookListener_Success) { - Evolution_BookListener_respond_open_book ( + if (status == GNOME_Evolution_Addressbook_BookListener_Success) { + GNOME_Evolution_Addressbook_BookListener_notifyBookOpened ( book->priv->listener, status, bonobo_object_corba_objref (BONOBO_OBJECT (book)), &ev); } else { - Evolution_BookListener_respond_open_book ( + GNOME_Evolution_Addressbook_BookListener_notifyBookOpened ( book->priv->listener, status, CORBA_OBJECT_NIL, &ev); } @@ -388,14 +388,14 @@ pas_book_respond_open (PASBook *book, */ void pas_book_respond_create (PASBook *book, - Evolution_BookListener_CallStatus status, + GNOME_Evolution_Addressbook_BookListener_CallStatus status, const char *id) { CORBA_Environment ev; CORBA_exception_init (&ev); - Evolution_BookListener_respond_create_card ( + GNOME_Evolution_Addressbook_BookListener_notifyCardCreated ( book->priv->listener, status, (char *)id, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -411,13 +411,13 @@ pas_book_respond_create (PASBook *book, */ void pas_book_respond_remove (PASBook *book, - Evolution_BookListener_CallStatus status) + GNOME_Evolution_Addressbook_BookListener_CallStatus status) { CORBA_Environment ev; CORBA_exception_init (&ev); - Evolution_BookListener_respond_remove_card ( + GNOME_Evolution_Addressbook_BookListener_notifyCardRemoved ( book->priv->listener, status, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -433,13 +433,13 @@ pas_book_respond_remove (PASBook *book, */ void pas_book_respond_modify (PASBook *book, - Evolution_BookListener_CallStatus status) + GNOME_Evolution_Addressbook_BookListener_CallStatus status) { CORBA_Environment ev; CORBA_exception_init (&ev); - Evolution_BookListener_respond_modify_card ( + GNOME_Evolution_Addressbook_BookListener_notifyCardModified ( book->priv->listener, status, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -455,7 +455,7 @@ pas_book_respond_modify (PASBook *book, */ void pas_book_respond_get_cursor (PASBook *book, - Evolution_BookListener_CallStatus status, + GNOME_Evolution_Addressbook_BookListener_CallStatus status, PASCardCursor *cursor) { CORBA_Environment ev; @@ -465,7 +465,7 @@ pas_book_respond_get_cursor (PASBook *book, object = bonobo_object_corba_objref(BONOBO_OBJECT(cursor)); - Evolution_BookListener_respond_get_cursor ( + GNOME_Evolution_Addressbook_BookListener_notifyCursorRequested ( book->priv->listener, status, object, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -481,7 +481,7 @@ pas_book_respond_get_cursor (PASBook *book, */ void pas_book_respond_get_book_view (PASBook *book, - Evolution_BookListener_CallStatus status, + GNOME_Evolution_Addressbook_BookListener_CallStatus status, PASBookView *book_view) { CORBA_Environment ev; @@ -491,7 +491,7 @@ pas_book_respond_get_book_view (PASBook *book, object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view)); - Evolution_BookListener_respond_get_view ( + GNOME_Evolution_Addressbook_BookListener_notifyViewRequested ( book->priv->listener, status, object, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -507,7 +507,7 @@ pas_book_respond_get_book_view (PASBook *book, */ void pas_book_respond_get_changes (PASBook *book, - Evolution_BookListener_CallStatus status, + GNOME_Evolution_Addressbook_BookListener_CallStatus status, PASBookView *book_view) { CORBA_Environment ev; @@ -517,7 +517,7 @@ pas_book_respond_get_changes (PASBook *book, object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view)); - Evolution_BookListener_respond_get_changes ( + GNOME_Evolution_Addressbook_BookListener_notifyChangesRequested ( book->priv->listener, status, object, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -539,7 +539,7 @@ pas_book_report_connection (PASBook *book, CORBA_exception_init (&ev); - Evolution_BookListener_report_connection_status ( + GNOME_Evolution_Addressbook_BookListener_notifyConnectionStatus ( book->priv->listener, (CORBA_boolean) connected, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -553,12 +553,12 @@ pas_book_report_connection (PASBook *book, static gboolean pas_book_construct (PASBook *book, PASBackend *backend, - Evolution_BookListener listener, + GNOME_Evolution_Addressbook_BookListener listener, PASBookGetVCardFn get_vcard, PASBookCanWriteFn can_write, PASBookCanWriteCardFn can_write_card) { - POA_Evolution_Book *servant; + POA_GNOME_Evolution_Addressbook_Book *servant; CORBA_Environment ev; CORBA_Object obj; @@ -569,12 +569,12 @@ pas_book_construct (PASBook *book, g_assert (can_write != NULL); g_assert (can_write_card != NULL); - servant = (POA_Evolution_Book *) g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_Addressbook_Book *) g_new0 (BonoboObjectServant, 1); servant->vepv = &pas_book_vepv; CORBA_exception_init (&ev); - POA_Evolution_Book__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_Addressbook_Book__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); CORBA_exception_free (&ev); @@ -615,7 +615,7 @@ pas_book_construct (PASBook *book, */ PASBook * pas_book_new (PASBackend *backend, - Evolution_BookListener listener, + GNOME_Evolution_Addressbook_BookListener listener, PASBookGetVCardFn get_vcard, PASBookCanWriteFn can_write, PASBookCanWriteCardFn can_write_card) @@ -666,24 +666,24 @@ pas_book_destroy (GtkObject *object) GTK_OBJECT_CLASS (pas_book_parent_class)->destroy (object); } -static POA_Evolution_Book__epv * +static POA_GNOME_Evolution_Addressbook_Book__epv * pas_book_get_epv (void) { - POA_Evolution_Book__epv *epv; + POA_GNOME_Evolution_Addressbook_Book__epv *epv; - epv = g_new0 (POA_Evolution_Book__epv, 1); + epv = g_new0 (POA_GNOME_Evolution_Addressbook_Book__epv, 1); - epv->get_vcard = impl_Evolution_Book_get_vcard; - epv->can_write = impl_Evolution_Book_can_write; - epv->can_write_card = impl_Evolution_Book_can_write_card; - epv->create_card = impl_Evolution_Book_create_card; - epv->remove_card = impl_Evolution_Book_remove_card; - epv->modify_card = impl_Evolution_Book_modify_card; - epv->check_connection = impl_Evolution_Book_check_connection; - epv->get_static_capabilities = impl_Evolution_Book_get_static_capabilities; - epv->get_cursor = impl_Evolution_Book_get_cursor; - epv->get_book_view = impl_Evolution_Book_get_book_view; - epv->get_changes = impl_Evolution_Book_get_changes; + epv->getVCard = impl_GNOME_Evolution_Addressbook_Book_getVCard; + epv->isWriteable = impl_GNOME_Evolution_Addressbook_Book_isWriteable; + epv->isCardWriteable = impl_GNOME_Evolution_Addressbook_Book_isCardWriteable; + epv->addCard = impl_GNOME_Evolution_Addressbook_Book_addCard; + epv->removeCard = impl_GNOME_Evolution_Addressbook_Book_removeCard; + epv->modifyCard = impl_GNOME_Evolution_Addressbook_Book_modifyCard; + epv->checkConnection = impl_GNOME_Evolution_Addressbook_Book_checkConnection; + epv->getStaticCapabilities = impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities; + epv->getCursor = impl_GNOME_Evolution_Addressbook_Book_getCursor; + epv->getBookView = impl_GNOME_Evolution_Addressbook_Book_getBookView; + epv->getChanges = impl_GNOME_Evolution_Addressbook_Book_getChanges; return epv; @@ -693,7 +693,7 @@ static void pas_book_corba_class_init (void) { pas_book_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv (); - pas_book_vepv.Evolution_Book_epv = pas_book_get_epv (); + pas_book_vepv.GNOME_Evolution_Addressbook_Book_epv = pas_book_get_epv (); } static void -- cgit v1.2.3