diff options
author | Michael Meeks <mmeeks@src.gnome.org> | 2000-11-11 04:41:13 +0800 |
---|---|---|
committer | Michael Meeks <mmeeks@src.gnome.org> | 2000-11-11 04:41:13 +0800 |
commit | 3d3cfc1137a698a43d6a0137a2924f5933b12f17 (patch) | |
tree | 85495d5bb056aecc706dd74d872ef0e0b3cdcd4e /shell/e-shell.c | |
parent | 1d3b7827ed31cf56ab2684047287c48d439a77d6 (diff) | |
download | gsoc2013-evolution-3d3cfc1137a698a43d6a0137a2924f5933b12f17.tar.gz gsoc2013-evolution-3d3cfc1137a698a43d6a0137a2924f5933b12f17.tar.zst gsoc2013-evolution-3d3cfc1137a698a43d6a0137a2924f5933b12f17.zip |
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
Diffstat (limited to 'shell/e-shell.c')
-rw-r--r-- | shell/e-shell.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c index ad6e2c1336..f9b42ba8e5 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -96,14 +96,14 @@ static void folder_selection_dialog_cancelled_cb (EShellFolderSelectionDialog *folder_selection_dialog, void *data) { - Evolution_FolderSelectionListener listener; + GNOME_Evolution_FolderSelectionListener listener; CORBA_Environment ev; listener = gtk_object_get_data (GTK_OBJECT (folder_selection_dialog), "corba_listener"); CORBA_exception_init (&ev); - Evolution_FolderSelectionListener_cancel (listener, &ev); + GNOME_Evolution_FolderSelectionListener_notifyCanceled (listener, &ev); CORBA_exception_free (&ev); @@ -117,7 +117,7 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_ { CORBA_Environment ev; EShell *shell; - Evolution_FolderSelectionListener listener; + GNOME_Evolution_FolderSelectionListener listener; EStorageSet *storage_set; EFolder *folder; char *uri; @@ -138,7 +138,7 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_ else physical_uri = e_folder_get_physical_uri (folder); - Evolution_FolderSelectionListener_selected (listener, uri, physical_uri, &ev); + GNOME_Evolution_FolderSelectionListener_notifySelected (listener, uri, physical_uri, &ev); g_free (uri); CORBA_exception_free (&ev); @@ -149,20 +149,20 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_ /* CORBA interface implementation. */ -static POA_Evolution_Shell__vepv shell_vepv; +static POA_GNOME_Evolution_Shell__vepv shell_vepv; -static POA_Evolution_Shell * +static POA_GNOME_Evolution_Shell * create_servant (void) { - POA_Evolution_Shell *servant; + POA_GNOME_Evolution_Shell *servant; CORBA_Environment ev; - servant = (POA_Evolution_Shell *) g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_Shell *) g_new0 (BonoboObjectServant, 1); servant->vepv = &shell_vepv; CORBA_exception_init (&ev); - POA_Evolution_Shell__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_Shell__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); CORBA_exception_free (&ev); @@ -174,7 +174,7 @@ create_servant (void) return servant; } -static Evolution_ShellComponent +static GNOME_Evolution_ShellComponent impl_Shell_get_component_for_type (PortableServer_Servant servant, const CORBA_char *type, CORBA_Environment *ev) @@ -182,7 +182,7 @@ impl_Shell_get_component_for_type (PortableServer_Servant servant, BonoboObject *bonobo_object; EvolutionShellComponentClient *handler; EFolderTypeRegistry *folder_type_registry; - Evolution_ShellComponent corba_component; + GNOME_Evolution_ShellComponent corba_component; EShell *shell; bonobo_object = bonobo_object_from_servant (servant); @@ -192,7 +192,7 @@ impl_Shell_get_component_for_type (PortableServer_Servant servant, handler = e_folder_type_registry_get_handler_for_type (folder_type_registry, type); if (handler == NULL) { - CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Evolution_Shell_NotFound, NULL); + CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_NotFound, NULL); return CORBA_OBJECT_NIL; } @@ -206,9 +206,9 @@ static void corba_listener_destroy_notify (void *data) { CORBA_Environment ev; - Evolution_FolderSelectionListener listener_interface; + GNOME_Evolution_FolderSelectionListener listener_interface; - listener_interface = (Evolution_FolderSelectionListener) data; + listener_interface = (GNOME_Evolution_FolderSelectionListener) data; CORBA_exception_init (&ev); CORBA_Object_release (listener_interface, &ev); @@ -217,15 +217,15 @@ corba_listener_destroy_notify (void *data) static void impl_Shell_user_select_folder (PortableServer_Servant servant, - const Evolution_FolderSelectionListener listener, + const GNOME_Evolution_FolderSelectionListener listener, const CORBA_char *title, const CORBA_char *default_folder, - const Evolution_Shell_FolderTypeList *corba_allowed_types, + const GNOME_Evolution_Shell_FolderTypeList *corba_allowed_types, CORBA_Environment *ev) { GtkWidget *folder_selection_dialog; BonoboObject *bonobo_object; - Evolution_FolderSelectionListener listener_duplicate; + GNOME_Evolution_FolderSelectionListener listener_duplicate; EShell *shell; const char **allowed_types; int i; @@ -255,13 +255,13 @@ impl_Shell_user_select_folder (PortableServer_Servant servant, gtk_widget_show (folder_selection_dialog); } -static Evolution_LocalStorage +static GNOME_Evolution_LocalStorage impl_Shell_get_local_storage (PortableServer_Servant servant, CORBA_Environment *ev) { BonoboObject *bonobo_object; - Evolution_LocalStorage local_storage_interface; - Evolution_LocalStorage copy_of_local_storage_interface; + GNOME_Evolution_LocalStorage local_storage_interface; + GNOME_Evolution_LocalStorage copy_of_local_storage_interface; EShell *shell; EShellPrivate *priv; @@ -443,7 +443,7 @@ setup_components (EShell *shell, static void set_owner_on_components (EShell *shell) { - Evolution_Shell corba_shell; + GNOME_Evolution_Shell corba_shell; EShellPrivate *priv; const char *local_directory; GList *id_list; @@ -570,8 +570,8 @@ destroy (GtkObject *object) static void corba_class_init (void) { - POA_Evolution_Shell__vepv *vepv; - POA_Evolution_Shell__epv *epv; + POA_GNOME_Evolution_Shell__vepv *vepv; + POA_GNOME_Evolution_Shell__epv *epv; PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); @@ -579,15 +579,15 @@ corba_class_init (void) base_epv->finalize = NULL; base_epv->default_POA = NULL; - epv = g_new0 (POA_Evolution_Shell__epv, 1); - epv->get_component_for_type = impl_Shell_get_component_for_type; - epv->user_select_folder = impl_Shell_user_select_folder; - epv->get_local_storage = impl_Shell_get_local_storage; - epv->create_storage_set_view = impl_Shell_create_storage_set_view; + epv = g_new0 (POA_GNOME_Evolution_Shell__epv, 1); + epv->getComponentByType = impl_Shell_get_component_for_type; + epv->selectUserFolder = impl_Shell_user_select_folder; + epv->getLocalStorage = impl_Shell_get_local_storage; + epv->createStorageSetView = impl_Shell_create_storage_set_view; vepv = &shell_vepv; vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - vepv->Evolution_Shell_epv = epv; + vepv->GNOME_Evolution_Shell_epv = epv; } static void @@ -647,7 +647,7 @@ init (EShell *shell) **/ void e_shell_construct (EShell *shell, - Evolution_Shell corba_object, + GNOME_Evolution_Shell corba_object, const char *local_directory, gboolean show_splash) { @@ -729,8 +729,8 @@ e_shell_new (const char *local_directory, { EShell *new; EShellPrivate *priv; - Evolution_Shell corba_object; - POA_Evolution_Shell *servant; + GNOME_Evolution_Shell corba_object; + POA_GNOME_Evolution_Shell *servant; g_return_val_if_fail (local_directory != NULL, NULL); g_return_val_if_fail (*local_directory != '\0', NULL); @@ -903,7 +903,7 @@ save_settings_for_component (EShell *shell, EvolutionShellComponentClient *client) { Bonobo_Unknown unknown_interface; - Evolution_Session session_interface; + GNOME_Evolution_Session session_interface; CORBA_Environment ev; char *prefix; gboolean retval; @@ -920,7 +920,7 @@ save_settings_for_component (EShell *shell, } prefix = g_strconcat ("/apps/Evolution/Shell/Components/", id, NULL); - Evolution_Session_save_configuration (session_interface, prefix, &ev); + GNOME_Evolution_Session_saveConfiguration (session_interface, prefix, &ev); if (ev._major == CORBA_NO_EXCEPTION) retval = TRUE; |