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

1 files changed, 35 insertions, 35 deletions

diff --git a/shell/evolution-storage-set-view.c b/shell/evolution-storage-set-view.c
index 70892c686d..1fcac0bc01 100644
--- a/shell/evolution-storage-set-view.c
+++ b/shell/evolution-storage-set-view.c
@@ -54,12 +54,12 @@ storage_set_view_widget_folder_selected_cb (EStorageSetView *storage_set_view_wi
 
 	for (p = priv->listeners; p != NULL; p = p->next) {
 		CORBA_Environment ev;
-		Evolution_StorageSetViewListener listener;
+		GNOME_Evolution_StorageSetViewListener listener;
 
 		CORBA_exception_init (&ev);
 
-		listener = (Evolution_StorageSetViewListener) p->data;
-		Evolution_StorageSetViewListener_folder_selected (listener, uri, &ev);
+		listener = (GNOME_Evolution_StorageSetViewListener) p->data;
+		GNOME_Evolution_StorageSetViewListener_notifyFolderSelected (listener, uri, &ev);
 
 		/* FIXME: What if we fail?  */
 
@@ -81,12 +81,12 @@ storage_set_view_widget_storage_selected_cb (EStorageSetView *storage_set_view_w
 
 	for (p = priv->listeners; p != NULL; p = p->next) {
 		CORBA_Environment ev;
-		Evolution_StorageSetViewListener listener;
+		GNOME_Evolution_StorageSetViewListener listener;
 
 		CORBA_exception_init (&ev);
 
-		listener = (Evolution_StorageSetViewListener) p->data;
-		Evolution_StorageSetViewListener_storage_selected (listener, uri, &ev);
+		listener = (GNOME_Evolution_StorageSetViewListener) p->data;
+		GNOME_Evolution_StorageSetViewListener_notifyStorageSelected (listener, uri, &ev);
 
 		/* FIXME: What if we fail?  */
 
@@ -98,7 +98,7 @@ storage_set_view_widget_storage_selected_cb (EStorageSetView *storage_set_view_w
 /* Listener handling.  */
 
 static GList *
-find_listener_in_list (Evolution_StorageSetViewListener listener,
+find_listener_in_list (GNOME_Evolution_StorageSetViewListener listener,
 		       GList *list)
 {
 	CORBA_Environment ev;
@@ -107,9 +107,9 @@ find_listener_in_list (Evolution_StorageSetViewListener listener,
 	CORBA_exception_init (&ev);
 
 	for (p = list; p != NULL; p = p->next) {
-		Evolution_StorageSetViewListener listener_item;
+		GNOME_Evolution_StorageSetViewListener listener_item;
 
-		listener_item = (Evolution_StorageSetViewListener) p->data;
+		listener_item = (GNOME_Evolution_StorageSetViewListener) p->data;
 		if (CORBA_Object_is_equivalent (listener, listener_item, &ev))
 			break;
 	}
@@ -121,12 +121,12 @@ find_listener_in_list (Evolution_StorageSetViewListener listener,
 
 static gboolean
 add_listener (EvolutionStorageSetView *storage_set_view,
-	      Evolution_StorageSetViewListener listener)
+	      GNOME_Evolution_StorageSetViewListener listener)
 {
 	EvolutionStorageSetViewPrivate *priv;
 	CORBA_Environment ev;
 	const char *current_uri;
-	Evolution_StorageSetViewListener copy_of_listener;
+	GNOME_Evolution_StorageSetViewListener copy_of_listener;
 
 	priv = storage_set_view->priv;
 
@@ -145,7 +145,7 @@ add_listener (EvolutionStorageSetView *storage_set_view,
 
 	current_uri = e_storage_set_view_get_current_folder (E_STORAGE_SET_VIEW (priv->storage_set_view_widget));
 	if (current_uri != NULL)
-		Evolution_StorageSetViewListener_folder_selected (listener, current_uri, &ev);
+		GNOME_Evolution_StorageSetViewListener_notifyFolderSelected (listener, current_uri, &ev);
 
 	CORBA_exception_free (&ev);
 
@@ -154,7 +154,7 @@ add_listener (EvolutionStorageSetView *storage_set_view,
 
 static gboolean
 remove_listener (EvolutionStorageSetView *storage_set_view,
-		 Evolution_StorageSetViewListener listener)
+		 GNOME_Evolution_StorageSetViewListener listener)
 {
 	EvolutionStorageSetViewPrivate *priv;
 	GList *listener_node;
@@ -178,20 +178,20 @@ remove_listener (EvolutionStorageSetView *storage_set_view,
 
 /* CORBA interface implementation.  */
 
-static POA_Evolution_StorageSetView__vepv StorageSetView_vepv;
+static POA_GNOME_Evolution_StorageSetView__vepv StorageSetView_vepv;
 
-static POA_Evolution_StorageSetView *
+static POA_GNOME_Evolution_StorageSetView *
 create_servant (void)
 {
-	POA_Evolution_StorageSetView *servant;
+	POA_GNOME_Evolution_StorageSetView *servant;
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
 
-	servant = (POA_Evolution_StorageSetView *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_StorageSetView *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &StorageSetView_vepv;
 
-	POA_Evolution_StorageSetView__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_StorageSetView__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		servant = NULL;
@@ -204,7 +204,7 @@ create_servant (void)
 
 static void
 impl_StorageSetView_add_listener (PortableServer_Servant servant,
-				  const Evolution_StorageSetViewListener listener,
+				  const GNOME_Evolution_StorageSetViewListener listener,
 				  CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
@@ -215,12 +215,12 @@ impl_StorageSetView_add_listener (PortableServer_Servant servant,
 
 	if (! add_listener (storage_set_view, listener))
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_StorageSetView_AlreadyListening, NULL);
+				     ex_GNOME_Evolution_StorageSetView_AlreadyListening, NULL);
 }
 
 static void
 impl_StorageSetView_remove_listener (PortableServer_Servant servant,
-				     const Evolution_StorageSetViewListener listener,
+				     const GNOME_Evolution_StorageSetViewListener listener,
 				     CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
@@ -231,7 +231,7 @@ impl_StorageSetView_remove_listener (PortableServer_Servant servant,
 
 	if (! remove_listener (storage_set_view, listener))
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_StorageSetView_NotFound, NULL);
+				     ex_GNOME_Evolution_StorageSetView_NotFound, NULL);
 }
 
 static CORBA_boolean
@@ -285,9 +285,9 @@ impl_destroy (GtkObject *object)
 	CORBA_exception_init (&ev);
 
 	for (p = priv->listeners; p != NULL; p = p->next) {
-		Evolution_StorageSetViewListener listener;
+		GNOME_Evolution_StorageSetViewListener listener;
 
-		listener = (Evolution_StorageSetViewListener) p->data;
+		listener = (GNOME_Evolution_StorageSetViewListener) p->data;
 		CORBA_Object_release (listener, &ev);
 	}
 
@@ -303,8 +303,8 @@ impl_destroy (GtkObject *object)
 static void
 corba_class_init (void)
 {
-	POA_Evolution_StorageSetView__vepv *vepv;
-	POA_Evolution_StorageSetView__epv *epv;
+	POA_GNOME_Evolution_StorageSetView__vepv *vepv;
+	POA_GNOME_Evolution_StorageSetView__epv *epv;
 	PortableServer_ServantBase__epv *base_epv;
 
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -312,16 +312,16 @@ corba_class_init (void)
 	base_epv->finalize    = NULL;
 	base_epv->default_POA = NULL;
 
-	epv = g_new0 (POA_Evolution_StorageSetView__epv, 1);
-	epv->add_listener    = impl_StorageSetView_add_listener;
-	epv->remove_listener = impl_StorageSetView_remove_listener;
-	epv->_set_show_folders = impl_StorageSetView__set_show_folders;
-	epv->_get_show_folders = impl_StorageSetView__get_show_folders;
+	epv = g_new0 (POA_GNOME_Evolution_StorageSetView__epv, 1);
+	epv->addListener      = impl_StorageSetView_add_listener;
+	epv->removeListener   = impl_StorageSetView_remove_listener;
+	epv->_set_showFolders = impl_StorageSetView__set_show_folders;
+	epv->_get_showFolders = impl_StorageSetView__get_show_folders;
 
 	vepv = &StorageSetView_vepv;
 	vepv->_base_epv                    = base_epv;
 	vepv->Bonobo_Unknown_epv           = bonobo_object_get_epv ();
-	vepv->Evolution_StorageSetView_epv = epv;
+	vepv->GNOME_Evolution_StorageSetView_epv = epv;
 }
 
 static void
@@ -352,7 +352,7 @@ init (EvolutionStorageSetView *storage_set_view)
 
 void
 evolution_storage_set_view_construct (EvolutionStorageSetView *storage_set_view,
-				      Evolution_StorageSetView corba_object,
+				      GNOME_Evolution_StorageSetView corba_object,
 				      EStorageSetView *storage_set_view_widget)
 {
 	EvolutionStorageSetViewPrivate *priv;
@@ -379,8 +379,8 @@ evolution_storage_set_view_construct (EvolutionStorageSetView *storage_set_view,
 EvolutionStorageSetView *
 evolution_storage_set_view_new (EStorageSetView *storage_set_view_widget)
 {
-	POA_Evolution_StorageSetView *servant;
-	Evolution_StorageSetView corba_object;
+	POA_GNOME_Evolution_StorageSetView *servant;
+	GNOME_Evolution_StorageSetView corba_object;
 	EvolutionStorageSetView *new;
 
 	g_return_val_if_fail (storage_set_view_widget != NULL, NULL);