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

7 files changed, 33 insertions, 33 deletions

diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am
index 5b3f147dfd..b580823455 100644
--- a/executive-summary/component/Makefile.am
+++ b/executive-summary/component/Makefile.am
@@ -32,8 +32,8 @@ COMPOSER_GENERATED = \
 Composer-impl.o: Composer.h
 
 $(COMPOSER_GENERATED):
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
-		-I$(srcdir) $(top_srcdir)/composer/Composer.idl
+	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
+		$(top_srcdir)/composer/Composer.idl
 
 evolution_executive_summary_SOURCES =		\
 	$(COMPOSER_GENERATED)		\
diff --git a/executive-summary/component/component-factory.c b/executive-summary/component/component-factory.c
index 9af99c7e67..ad381fb51a 100644
--- a/executive-summary/component/component-factory.c
+++ b/executive-summary/component/component-factory.c
@@ -60,7 +60,7 @@ create_view (EvolutionShellComponent *shell_component,
 	     void *closure)
 {
   EvolutionShellClient *shell_client;
-  Evolution_Shell corba_shell;
+  GNOME_Evolution_Shell corba_shell;
   BonoboControl *control;
 
   if (g_strcasecmp (folder_type, "executive-summary") != 0)
@@ -84,7 +84,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 	      const char *evolution_homedir,
 	      gpointer user_data)
 {
-  Evolution_Shell corba_shell;
+  GNOME_Evolution_Shell corba_shell;
 
   evolution_dir = g_strdup (evolution_homedir);
 
diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
index 79105c18a0..5ff8a54dc9 100644
--- a/executive-summary/component/e-summary-factory.c
+++ b/executive-summary/component/e-summary-factory.c
@@ -121,7 +121,7 @@ control_activate_cb (BonoboControl *control,
 	ESummary *summary;
 	BonoboUIComponent *ui_component;
 	Bonobo_ControlFrame control_frame;
-	Evolution_ShellView shell_view_interface;
+	GNOME_Evolution_ShellView shell_view_interface;
 	CORBA_Environment ev;
 
 	ui_component = bonobo_control_get_ui_component (control);
@@ -269,7 +269,7 @@ e_summary_factory_embed_service_from_id (ESummary *esummary,
 
 BonoboControl *
 e_summary_factory_new_control (const char *uri,
-			       const Evolution_Shell shell)
+			       const GNOME_Evolution_Shell shell)
 {
   BonoboControl *control;
   GtkWidget *esummary;
diff --git a/executive-summary/component/e-summary-factory.h b/executive-summary/component/e-summary-factory.h
index 175988a78c..4c704e46ee 100644
--- a/executive-summary/component/e-summary-factory.h
+++ b/executive-summary/component/e-summary-factory.h
@@ -28,7 +28,7 @@
 #include "e-summary.h"
 
 BonoboControl *e_summary_factory_new_control (const char *uri,
-					      const Evolution_Shell shell);
+					      const GNOME_Evolution_Shell shell);
 void e_summary_factory_embed_service_from_id (ESummary *esummary,
 					      const char *obj_id);
 
diff --git a/executive-summary/component/e-summary-url.c b/executive-summary/component/e-summary-url.c
index c07a3efc99..9dfff28713 100644
--- a/executive-summary/component/e-summary-url.c
+++ b/executive-summary/component/e-summary-url.c
@@ -443,8 +443,8 @@ e_summary_url_mail_compose (ESummary *esummary,
 {
 	CORBA_Object composer;
 	CORBA_Environment ev;
-	Evolution_Composer_RecipientList *to, *cc, *bcc;
-	Evolution_Composer_Recipient *recipient;
+	GNOME_Evolution_Composer_RecipientList *to, *cc, *bcc;
+	GNOME_Evolution_Composer_Recipient *recipient;
 	char *address, *proto;
 	CORBA_char *subject;
 	
@@ -467,30 +467,30 @@ e_summary_url_mail_compose (ESummary *esummary,
 			address = (char *) url;
 	}
 
-	to = Evolution_Composer_RecipientList__alloc ();
+	to = GNOME_Evolution_Composer_RecipientList__alloc ();
 	to->_length = 1;
 	to->_maximum = 1;
-	to->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (to->_maximum);
+	to->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (to->_maximum);
 	
 	recipient = to->_buffer;
 	recipient->name = CORBA_string_dup ("");
 	recipient->address = CORBA_string_dup (address?address:"");
 	
 	/* FIXME: Get these out of the URL */
-	cc = Evolution_Composer_RecipientList__alloc ();
+	cc = GNOME_Evolution_Composer_RecipientList__alloc ();
 	cc->_length = 0;
 	cc->_maximum = 0;
-	cc->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (cc->_maximum);
+	cc->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (cc->_maximum);
 	
-	bcc = Evolution_Composer_RecipientList__alloc ();
+	bcc = GNOME_Evolution_Composer_RecipientList__alloc ();
 	bcc->_length = 0;
 	bcc->_maximum = 0;
-	bcc->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (bcc->_maximum);
+	bcc->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (bcc->_maximum);
 	
 	subject = CORBA_string_dup ("");
 	
 	CORBA_exception_init (&ev);
-	Evolution_Composer_set_headers (composer, to, cc, bcc, subject, &ev);
+	GNOME_Evolution_Composer_setHeaders (composer, to, cc, bcc, subject, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		CORBA_exception_free (&ev);
 		CORBA_free (to);
@@ -501,7 +501,7 @@ e_summary_url_mail_compose (ESummary *esummary,
 	CORBA_free (to);
 	
 	CORBA_exception_init (&ev);  
-	Evolution_Composer_show (composer, &ev);
+	GNOME_Evolution_Composer_show (composer, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		CORBA_exception_free (&ev);
 		g_warning ("%s(%d): Error showing composer", __FUNCTION__, __LINE__);
diff --git a/executive-summary/component/e-summary.c b/executive-summary/component/e-summary.c
index dca8f98f0f..46ea9cbae1 100644
--- a/executive-summary/component/e-summary.c
+++ b/executive-summary/component/e-summary.c
@@ -45,8 +45,8 @@ extern char *evolution_dir;
 static GtkObjectClass *e_summary_parent_class;
 
 struct _ESummaryPrivate {
-	Evolution_Shell shell;
-	Evolution_ShellView shell_view_interface;
+	GNOME_Evolution_Shell shell;
+	GNOME_Evolution_ShellView shell_view_interface;
 
 	GtkWidget *html_scroller;
 	GtkWidget *html;
@@ -214,7 +214,7 @@ E_MAKE_TYPE (e_summary, "ESummary", ESummary, e_summary_class_init,
 	     e_summary_init, PARENT_TYPE);
 
 GtkWidget *
-e_summary_new (const Evolution_Shell shell)
+e_summary_new (const GNOME_Evolution_Shell shell)
 {
 	ESummary *esummary;
 	ESummaryPrivate *priv;
@@ -546,7 +546,7 @@ e_summary_view_from_id (ESummary *esummary,
 
 void
 e_summary_set_shell_view_interface (ESummary *summary,
-				    Evolution_ShellView svi)
+				    GNOME_Evolution_ShellView svi)
 {
 	ESummaryPrivate *priv;
 
@@ -558,14 +558,14 @@ e_summary_set_shell_view_interface (ESummary *summary,
 	priv->shell_view_interface = svi;
 }
 
-/* Wrappers for Evolution_ShellView */
+/* Wrappers for GNOME_Evolution_ShellView */
 void
 e_summary_set_message (ESummary *esummary,
 		       const char *message,
 		       gboolean busy)
 {
 	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
+	GNOME_Evolution_ShellView svi;
 	CORBA_Environment ev;
 
 	g_return_if_fail (esummary != NULL);
@@ -579,9 +579,9 @@ e_summary_set_message (ESummary *esummary,
 
 	CORBA_exception_init (&ev);
 	if (message != NULL)
-		Evolution_ShellView_set_message (svi, message, busy, &ev);
+		GNOME_Evolution_ShellView_setMessage (svi, message, busy, &ev);
 	else 
-		Evolution_ShellView_set_message (svi, "", busy, &ev);
+		GNOME_Evolution_ShellView_setMessage (svi, "", busy, &ev);
 	CORBA_exception_free (&ev);
 }
 
@@ -589,7 +589,7 @@ void
 e_summary_unset_message (ESummary *esummary)
 {
 	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
+	GNOME_Evolution_ShellView svi;
 	CORBA_Environment ev;
 
 	g_return_if_fail (esummary != NULL);
@@ -602,7 +602,7 @@ e_summary_unset_message (ESummary *esummary)
 		return;
 
 	CORBA_exception_init (&ev);
-	Evolution_ShellView_unset_message (svi, &ev);
+	GNOME_Evolution_ShellView_unsetMessage (svi, &ev);
 	CORBA_exception_free (&ev);
 }
 
@@ -611,7 +611,7 @@ e_summary_change_current_view (ESummary *esummary,
 			       const char *uri)
 {
 	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
+	GNOME_Evolution_ShellView svi;
 	CORBA_Environment ev;
 
 	g_return_if_fail (esummary != NULL);
@@ -624,7 +624,7 @@ e_summary_change_current_view (ESummary *esummary,
 		return;
 
 	CORBA_exception_init (&ev);
-	Evolution_ShellView_change_current_view (svi, uri, &ev);
+	GNOME_Evolution_ShellView_changeCurrentView (svi, uri, &ev);
 	CORBA_exception_free (&ev);
 }
 
@@ -633,7 +633,7 @@ e_summary_set_title (ESummary *esummary,
 		     const char *title)
 {
 	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
+	GNOME_Evolution_ShellView svi;
 	CORBA_Environment ev;
 
 	g_return_if_fail (esummary != NULL);
@@ -646,7 +646,7 @@ e_summary_set_title (ESummary *esummary,
 		return;
 
 	CORBA_exception_init (&ev);
-	Evolution_ShellView_set_title (svi, title, &ev);
+	GNOME_Evolution_ShellView_setTitle (svi, title, &ev);
 	CORBA_exception_free (&ev);
 }
 
diff --git a/executive-summary/component/e-summary.h b/executive-summary/component/e-summary.h
index f68575d76c..2e930cd692 100644
--- a/executive-summary/component/e-summary.h
+++ b/executive-summary/component/e-summary.h
@@ -61,7 +61,7 @@ struct _ESummaryClass {
 };
 
 GtkType e_summary_get_type (void);
-GtkWidget *e_summary_new (const Evolution_Shell shell);
+GtkWidget *e_summary_new (const GNOME_Evolution_Shell shell);
 int e_summary_rebuild_page (ESummary *esummary);
 void e_summary_add_html_service (ESummary *esummary,
 				 ExecutiveSummary *summary,
@@ -89,7 +89,7 @@ void e_summary_add_service (ESummary *esummary,
 ExecutiveSummaryComponentView * e_summary_view_from_id (ESummary *esummary,
 							int id);
 void e_summary_set_shell_view_interface (ESummary *summary,
-					 Evolution_ShellView svi);
+					 GNOME_Evolution_ShellView svi);
 void e_summary_set_message (ESummary *esummary,
 			    const char *message,
 			    gboolean busy);