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

21 files changed, 70 insertions, 61 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 73c56c9880..f8472b82ba 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-10  Michael Meeks  <michael@helixcode.com>
+
+	* Makefile.am ($(EVOLUTION_MAIL_CORBA_GENERATED)): sort include order.
+
 2000-11-09  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* subscribe-dialog.glade[.h]: New glade file for possibly using to
diff --git a/mail/Mail.idl b/mail/Mail.idl
index 1d12a39c5c..14e17b3993 100644
--- a/mail/Mail.idl
+++ b/mail/Mail.idl
@@ -9,12 +9,13 @@
 
 #include <Bonobo.idl>
 
+module GNOME {
 module Evolution {
 	
 	interface MessageList : Bonobo::Unknown {
 		
-		void select_message (in long message_number);
-		void open_message   (in long message_number);
+		void selectMessage (in long message_number);
+		void openMessage   (in long message_number);
 	};
 	
 	/*
@@ -24,7 +25,8 @@ module Evolution {
 	 * Bonobo Properties
 	 */
 	interface FolderBrowser : Bonobo::Unknown {
-		MessageList get_message_list ();
+		MessageList getMessageList ();
 	};
 };
+};
 
diff --git a/mail/Makefile.am b/mail/Makefile.am
index b28ec287c4..828db23433 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -143,7 +143,8 @@ glade_messages = \
 iconsdir = $(datadir)/images/evolution
 
 $(EVOLUTION_MAIL_CORBA_GENERATED): Mail.idl 
-	$(ORBIT_IDL) -I $(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` -I `$(GNOME_CONFIG) --datadir`/idl -I $(srcdir) $(srcdir)/Mail.idl
+	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` \
+	-I `$(GNOME_CONFIG) --datadir`/idl $(srcdir)/Mail.idl
 
 EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_DATA) $(glade_messages)
 
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 014c4b8e3b..111718b5e2 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -77,7 +77,7 @@ create_view (EvolutionShellComponent *shell_component,
 	     void *closure)
 {
 	EvolutionShellClient *shell_client;
-	Evolution_Shell corba_shell;
+	GNOME_Evolution_Shell corba_shell;
 	BonoboControl *control;
 	GtkWidget *folder_browser_widget;
 
@@ -105,7 +105,7 @@ static void
 create_folder (EvolutionShellComponent *shell_component,
 	       const char *physical_uri,
 	       const char *type,
-	       const Evolution_ShellComponentListener listener,
+	       const GNOME_Evolution_ShellComponentListener listener,
 	       void *closure)
 {
 	mail_do_create_folder (listener, physical_uri, type);
@@ -118,7 +118,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 	      gpointer user_data)
 {
 	GSList *sources;
-	Evolution_Shell corba_shell;
+	GNOME_Evolution_Shell corba_shell;
 
 	g_print ("evolution-mail: Yeeeh! We have an owner!\n");	/* FIXME */
 	
@@ -253,7 +253,7 @@ create_vfolder_storage (EvolutionShellComponent *shell_component)
 
 static void
 add_storage (const char *uri, CamelService *store,
-	     Evolution_Shell corba_shell, CamelException *ex)
+	     GNOME_Evolution_Shell corba_shell, CamelException *ex)
 {
 	EvolutionStorage *storage;
 	EvolutionStorageResult res;
@@ -282,7 +282,7 @@ add_storage (const char *uri, CamelService *store,
 }
 
 void
-mail_load_storages (Evolution_Shell corba_shell, GSList *sources)
+mail_load_storages (GNOME_Evolution_Shell corba_shell, GSList *sources)
 {
 	CamelException ex;
 	MailConfigService *svc;
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index ea0bde946d..71a57b8d9b 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -206,7 +206,7 @@ control_destroy_cb (BonoboControl *control,
 
 BonoboControl *
 folder_browser_factory_new_control (const char *uri,
-				    const Evolution_Shell shell)
+				    const GNOME_Evolution_Shell shell)
 {
 	BonoboControl *control;
 	GtkWidget *folder_browser;
diff --git a/mail/folder-browser-factory.h b/mail/folder-browser-factory.h
index b47913a66a..d2d35d38b7 100644
--- a/mail/folder-browser-factory.h
+++ b/mail/folder-browser-factory.h
@@ -15,7 +15,7 @@
 #include "Evolution.h"
 
 BonoboControl *folder_browser_factory_new_control       (const char            *uri,
-							 const Evolution_Shell  shell);
+							 const GNOME_Evolution_Shell  shell);
 GList         *folder_browser_factory_get_control_list  (void);
 
 #endif /* _FOLDER_BROWSER_FACTORY_H */
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 3a2162be42..d8989cdbeb 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -739,7 +739,7 @@ my_folder_browser_init (GtkObject *object)
 }
 
 GtkWidget *
-folder_browser_new (const Evolution_Shell shell)
+folder_browser_new (const GNOME_Evolution_Shell shell)
 {
 	static int serial = 0;
 	CORBA_Environment ev;
diff --git a/mail/folder-browser.h b/mail/folder-browser.h
index 7ddc9a1954..490088c639 100644
--- a/mail/folder-browser.h
+++ b/mail/folder-browser.h
@@ -27,7 +27,7 @@ struct  _FolderBrowser {
 	
 	BonoboPropertyBag *properties;
 	
-	Evolution_Shell shell;
+	GNOME_Evolution_Shell shell;
 	
 	/* This is a kludge for the toolbar problem. */
 	int serial;
@@ -65,7 +65,7 @@ struct fb_ondemand_closure {
 };
 
 GtkType    folder_browser_get_type             (void);
-GtkWidget *folder_browser_new                  (const Evolution_Shell  shell);
+GtkWidget *folder_browser_new                  (const GNOME_Evolution_Shell  shell);
 
 gboolean   folder_browser_set_uri              (FolderBrowser         *folder_browser,
 						const char            *uri);
diff --git a/mail/mail-config-gui.c b/mail/mail-config-gui.c
index 15099d8332..0c6d9c7a74 100644
--- a/mail/mail-config-gui.c
+++ b/mail/mail-config-gui.c
@@ -142,7 +142,7 @@ typedef struct
 
 typedef struct
 {
-	Evolution_Shell shell;
+	GNOME_Evolution_Shell shell;
 	GladeXML *gui;
 	GtkWidget *dialog;
 	GtkWidget *druid;
@@ -156,7 +156,7 @@ typedef struct
 
 typedef struct
 {
-	Evolution_Shell shell;
+	GNOME_Evolution_Shell shell;
 	GladeXML *gui;
 	GtkWidget *dialog;
 	GtkWidget *clistIdentities;
@@ -1570,7 +1570,7 @@ mail_druid_finish (GnomeDruidPage *page, GnomeDruid *druid,
 }
 
 void
-mail_config_druid (Evolution_Shell shell)
+mail_config_druid (GNOME_Evolution_Shell shell)
 {
 	MailDruidDialog *dialog;
 	GnomeDruidPageStart *spage;
@@ -2019,7 +2019,7 @@ mail_config_close (GnomePropertyBox *property_box, MailDialog *dialog)
 }
 	
 void
-mail_config (Evolution_Shell shell)
+mail_config (GNOME_Evolution_Shell shell)
 {
 	MailDialog *dialog;
 	GladeXML *gui;
diff --git a/mail/mail-config-gui.h b/mail/mail-config-gui.h
index c8cbb33207..a6809e3cf3 100644
--- a/mail/mail-config-gui.h
+++ b/mail/mail-config-gui.h
@@ -25,7 +25,7 @@
 
 #include "shell/Evolution.h"
 
-void mail_config (Evolution_Shell shell);
-void mail_config_druid (Evolution_Shell shell);
+void mail_config (GNOME_Evolution_Shell shell);
+void mail_config_druid (GNOME_Evolution_Shell shell);
 
 #endif
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 35f6b51e96..b256e1b4f0 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -666,6 +666,7 @@ mail_html_write (GtkHTML *html, GtkHTMLStream *stream,
 	va_start (ap, format);
 	buf = g_strdup_vprintf (format, ap);
 	va_end (ap);
+	printf ("Writing html '%s'\n", buf);
 	gtk_html_write (html, stream, buf, strlen (buf));
 	g_free (buf);
 }
@@ -686,6 +687,7 @@ mail_text_write (GtkHTML *html, GtkHTMLStream *stream,
 				   E_TEXT_TO_HTML_CONVERT_NL |
 				   E_TEXT_TO_HTML_CONVERT_SPACES);
 	gtk_html_write (html, stream, "<tt>", 4);
+	printf ("Writing text '%s'\n", htmltext);
 	gtk_html_write (html, stream, htmltext, strlen (htmltext));
 	gtk_html_write (html, stream, "</tt>", 5);
 	g_free (htmltext);
diff --git a/mail/mail-local.c b/mail/mail-local.c
index ab2c4eba09..57d8a4e68c 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -457,7 +457,7 @@ local_reconfigure_folder(FolderBrowser *fb)
 typedef struct {
 	CamelStore parent_object;	
 
-	Evolution_LocalStorage corba_local_storage;
+	GNOME_Evolution_LocalStorage corba_local_storage;
 	EvolutionStorageListener *local_storage_listener;
 
 	char *local_path;
@@ -636,12 +636,12 @@ local_folder_changed (CamelObject *object, gpointer event_data,
 		if (unread > 0) {
 			display = g_strdup_printf ("%s (%d)",
 						   local_folder->name, unread);
-			Evolution_LocalStorage_update_folder (
+			GNOME_Evolution_LocalStorage_updateFolder (
 				local_folder->local_store->corba_local_storage,
 				local_folder->path, display, TRUE, &ev);
 			g_free (display);
 		} else {
-			Evolution_LocalStorage_update_folder (
+			GNOME_Evolution_LocalStorage_updateFolder (
 				local_folder->local_store->corba_local_storage,
 				local_folder->path, local_folder->name,
 				FALSE, &ev);
@@ -702,7 +702,7 @@ static const mail_operation_spec op_register_folder =
 static void
 local_storage_new_folder_cb (EvolutionStorageListener *storage_listener,
 			     const char *path,
-			     const Evolution_Folder *folder,
+			     const GNOME_Evolution_Folder *folder,
 			     void *data)
 {
 	MailLocalStore *local_store = data;
@@ -789,7 +789,7 @@ mail_local_storage_startup (EvolutionShellClient *shellclient,
 			    const char *evolution_path)
 {
 	MailLocalStore *local_store;
-	Evolution_StorageListener corba_local_storage_listener;
+	GNOME_Evolution_StorageListener corba_local_storage_listener;
 	CORBA_Environment ev;
 
 	/* Register with Camel to handle file: URLs */
@@ -841,7 +841,7 @@ mail_local_storage_startup (EvolutionShellClient *shellclient,
 	local_store->folders = g_hash_table_new (g_str_hash, g_str_equal);
 
 	CORBA_exception_init (&ev);
-	Evolution_Storage_add_listener (local_store->corba_local_storage,
+	GNOME_Evolution_Storage_addListener (local_store->corba_local_storage,
 					corba_local_storage_listener, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Cannot add a listener to the Local Storage.");
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 34afb6a130..b334614c8e 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1734,7 +1734,7 @@ mail_do_load_folder (FolderBrowser *fb, const char *url)
 
 typedef struct create_folder_input_s
 {
-	Evolution_ShellComponentListener listener;
+	GNOME_Evolution_ShellComponentListener listener;
 	char *uri;
 	char *type;
 }
@@ -1742,7 +1742,7 @@ create_folder_input_t;
 
 typedef struct create_folder_data_s
 {
-	Evolution_ShellComponentListener_Result result;
+	GNOME_Evolution_ShellComponentListener_Result result;
 }
 create_folder_data_t;
 
@@ -1769,7 +1769,7 @@ do_create_folder (gpointer in_data, gpointer op_data, CamelException *ex)
 
 	if (strcmp (input->type, "mail") != 0)
 		data->result =
-			Evolution_ShellComponentListener_UNSUPPORTED_TYPE;
+			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE;
 	else {
 		camel_url = g_strdup_printf ("mbox://%s", input->uri);
 		/* FIXME: supply a way to make indexes optional */
@@ -1780,10 +1780,10 @@ do_create_folder (gpointer in_data, gpointer op_data, CamelException *ex)
 
 		if (!camel_exception_is_set (ex)) {
 			camel_object_unref (CAMEL_OBJECT (folder));
-			data->result = Evolution_ShellComponentListener_OK;
+			data->result = GNOME_Evolution_ShellComponentListener_OK;
 		} else {
 			data->result =
-				Evolution_ShellComponentListener_INVALID_URI;
+				GNOME_Evolution_ShellComponentListener_INVALID_URI;
 		}
 	}
 }
@@ -1798,7 +1798,7 @@ cleanup_create_folder (gpointer in_data, gpointer op_data,
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
-	Evolution_ShellComponentListener_report_result (input->listener,
+	GNOME_Evolution_ShellComponentListener_notifyResult (input->listener,
 							data->result, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION)
 		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
@@ -1821,7 +1821,7 @@ static const mail_operation_spec op_create_folder = {
 };
 
 void
-mail_do_create_folder (const Evolution_ShellComponentListener listener,
+mail_do_create_folder (const GNOME_Evolution_ShellComponentListener listener,
 		       const char *uri, const char *type)
 {
 	CORBA_Environment ev;
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index d6cb7a2cc0..262cfcfc18 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -61,7 +61,7 @@ void mail_do_forward_message (CamelMimeMessage *basis, CamelFolder *source,
 			      GPtrArray *uids,	/*array of allocated gchar *, will all be freed */
 			      EMsgComposer *composer);
 void mail_do_load_folder (FolderBrowser *fb, const char *url);
-void mail_do_create_folder (const Evolution_ShellComponentListener listener,
+void mail_do_create_folder (const GNOME_Evolution_ShellComponentListener listener,
 			    const char *uri, const char *type);
 void mail_do_sync_folder (CamelFolder *folder);
 void mail_do_display_message (MessageList *ml, MailDisplay *md, const char *uid,
diff --git a/mail/mail-threads.c b/mail/mail-threads.c
index cc66b60ce2..588576e872 100644
--- a/mail/mail-threads.c
+++ b/mail/mail-threads.c
@@ -1025,11 +1025,11 @@ block_release (block_info_t *info)
 
 /* FIXME FIXME FIXME This is a totally evil hack.  */
 
-static Evolution_ShellView
+static GNOME_Evolution_ShellView
 retrieve_shell_view_interface_from_control (BonoboControl *control)
 {
 	Bonobo_ControlFrame control_frame;
-	Evolution_ShellView shell_view_interface;
+	GNOME_Evolution_ShellView shell_view_interface;
 	CORBA_Environment ev;
 
 	control_frame = bonobo_control_get_control_frame (control);
@@ -1062,7 +1062,7 @@ update_active_views (void)
 	controls = folder_browser_factory_get_control_list ();
 	for (p = controls; p != NULL; p = p->next) {
 		BonoboControl *control;
-		Evolution_ShellView shell_view_interface;
+		GNOME_Evolution_ShellView shell_view_interface;
 		CORBA_Environment ev;
 
 		control = BONOBO_CONTROL (p->data);
@@ -1076,15 +1076,15 @@ update_active_views (void)
 
 		if (shell_view_interface != CORBA_OBJECT_NIL) {
 			if (current_message == NULL && ! busy) {
-				Evolution_ShellView_unset_message (shell_view_interface, &ev);
+				GNOME_Evolution_ShellView_unsetMessage (shell_view_interface, &ev);
 			} else {
 				if (current_message == NULL)
-					Evolution_ShellView_set_message (shell_view_interface,
+					GNOME_Evolution_ShellView_setMessage (shell_view_interface,
 									 "",
 									 busy,
 									 &ev);
 				else
-					Evolution_ShellView_set_message (shell_view_interface,
+					GNOME_Evolution_ShellView_setMessage (shell_view_interface,
 									 current_message,
 									 busy,
 									 &ev);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 5bdac810cc..d97e907d0f 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -131,7 +131,7 @@ void
 vfolder_create_storage(EvolutionShellComponent *shell_component)
 {
 	EvolutionShellClient *shell_client;
-	Evolution_Shell corba_shell;
+	GNOME_Evolution_Shell corba_shell;
 	EvolutionStorage *storage;
 	char *user, *system;
 
diff --git a/mail/mail.h b/mail/mail.h
index 481c031585..9a897d52f1 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -64,6 +64,6 @@ GtkWidget *mail_view_create (CamelFolder *source, const char *uid, CamelMimeMess
 
 /* component factory for lack of a better place */
 /*takes a GSList of MailConfigServices */
-void mail_load_storages (Evolution_Shell corba_shell, GSList *sources);
+void mail_load_storages (GNOME_Evolution_Shell corba_shell, GSList *sources);
 /* used in the subscribe dialog code */
 EvolutionStorage *mail_lookup_storage (CamelStore *store);
diff --git a/mail/message-list.c b/mail/message-list.c
index d28021f77e..b1fcd8843f 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -82,7 +82,7 @@
 #define PARENT_TYPE (bonobo_object_get_type ())
 
 static BonoboObjectClass *message_list_parent_class;
-static POA_Evolution_MessageList__vepv evolution_message_list_vepv;
+static POA_GNOME_Evolution_MessageList__vepv evolution_message_list_vepv;
 
 static void on_cursor_change_cmd (ETableScrolled *table, int row, gpointer user_data);
 static gint on_click (ETableScrolled *table, gint row, gint col, GdkEvent *event, MessageList *list);
@@ -1077,15 +1077,15 @@ MessageList_open_message (PortableServer_Servant _servant,
 	printf ("FIXME: open message method\n");
 }
 
-static POA_Evolution_MessageList__epv *
+static POA_GNOME_Evolution_MessageList__epv *
 evolution_message_list_get_epv (void)
 {
-	POA_Evolution_MessageList__epv *epv;
+	POA_GNOME_Evolution_MessageList__epv *epv;
 
-	epv = g_new0 (POA_Evolution_MessageList__epv, 1);
+	epv = g_new0 (POA_GNOME_Evolution_MessageList__epv, 1);
 
-	epv->select_message = MessageList_select_message;
-	epv->open_message   = MessageList_open_message;
+	epv->selectMessage = MessageList_select_message;
+	epv->openMessage   = MessageList_open_message;
 
 	return epv;
 }
@@ -1094,7 +1094,7 @@ static void
 message_list_corba_class_init (void)
 {
 	evolution_message_list_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	evolution_message_list_vepv.Evolution_MessageList_epv = evolution_message_list_get_epv ();
+	evolution_message_list_vepv.GNOME_Evolution_MessageList_epv = evolution_message_list_get_epv ();
 }
 
 /*
@@ -1123,22 +1123,22 @@ message_list_class_init (GtkObjectClass *object_class)
 }
 
 static void
-message_list_construct (MessageList *message_list, Evolution_MessageList corba_message_list)
+message_list_construct (MessageList *message_list, GNOME_Evolution_MessageList corba_message_list)
 {
 	bonobo_object_construct (BONOBO_OBJECT (message_list), corba_message_list);
 }
 
-static Evolution_MessageList
+static GNOME_Evolution_MessageList
 create_corba_message_list (BonoboObject *object)
 {
-	POA_Evolution_MessageList *servant;
+	POA_GNOME_Evolution_MessageList *servant;
 	CORBA_Environment ev;
 
-	servant = (POA_Evolution_MessageList *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_MessageList *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &evolution_message_list_vepv;
 
 	CORBA_exception_init (&ev);
-	POA_Evolution_MessageList__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_MessageList__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION){
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -1146,13 +1146,13 @@ create_corba_message_list (BonoboObject *object)
 	}
 
 	CORBA_exception_free (&ev);
-	return (Evolution_MessageList) bonobo_object_activate_servant (object, servant);
+	return (GNOME_Evolution_MessageList) bonobo_object_activate_servant (object, servant);
 }
 
 BonoboObject *
 message_list_new (void)
 {
-	Evolution_MessageList corba_object;
+	GNOME_Evolution_MessageList corba_object;
 	MessageList *message_list;
 
 	message_list = gtk_type_new (message_list_get_type ());
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index 7f198181de..a361f9ad26 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -1155,7 +1155,7 @@ subscribe_dialog_init (GtkObject *object)
 }
 
 static void
-subscribe_dialog_construct (GtkObject *object, Evolution_Shell shell)
+subscribe_dialog_construct (GtkObject *object, GNOME_Evolution_Shell shell)
 {
 	SubscribeDialog *sc = SUBSCRIBE_DIALOG (object);
 
@@ -1173,7 +1173,7 @@ subscribe_dialog_construct (GtkObject *object, Evolution_Shell shell)
 }
 
 GtkWidget *
-subscribe_dialog_new (Evolution_Shell shell)
+subscribe_dialog_new (GNOME_Evolution_Shell shell)
 {
 	SubscribeDialog *subscribe_dialog;
 
diff --git a/mail/subscribe-dialog.h b/mail/subscribe-dialog.h
index 4e1c5a2b49..34267efafd 100644
--- a/mail/subscribe-dialog.h
+++ b/mail/subscribe-dialog.h
@@ -41,7 +41,7 @@
 struct  _SubscribeDialog {
 	GtkObject parent;
 
-	Evolution_Shell           shell;
+	GNOME_Evolution_Shell           shell;
 
 	GtkWidget                *app;
 
@@ -72,6 +72,6 @@ typedef struct {
 } SubscribeDialogClass;
 
 GtkType    subscribe_dialog_get_type             (void);
-GtkWidget *subscribe_dialog_new                  (Evolution_Shell shell);
+GtkWidget *subscribe_dialog_new                  (GNOME_Evolution_Shell shell);
 
 #endif /* _SUBSCRIBE_DIALOG_H_ */
diff --git a/mail/test-mail.c b/mail/test-mail.c
index 917f2a2a2a..48bfbd507a 100644
--- a/mail/test-mail.c
+++ b/mail/test-mail.c
@@ -29,7 +29,7 @@ create_container (void)
 	gtk_widget_show (GTK_WIDGET (window));
 
 	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (BONOBO_WINDOW (window), container);
+	bonobo_ui_container_set_win (container, BONOBO_WINDOW (window));
 
 	control = bonobo_widget_new_control (
 		"OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45",