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

6 files changed, 51 insertions, 44 deletions

diff --git a/composer/ChangeLog b/composer/ChangeLog
index 42d0c9e0ed..a9b3305f3f 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-10  Michael Meeks  <michael@helixcode.com>
+
+	* Makefile.am ($(HTML_EDITOR_GENERATED)): rearrnace
+	includes.
+
 2000-11-10  Larry Ewing  <lewing@helixcode.com>
 
 	* e-msg-composer.c (build_message): set the HTML charset to utf-8
diff --git a/composer/Evolution-Composer.idl b/composer/Evolution-Composer.idl
index 1e3701a594..3fcda3873e 100644
--- a/composer/Evolution-Composer.idl
+++ b/composer/Evolution-Composer.idl
@@ -10,6 +10,7 @@
 
 #include <Bonobo.idl>
 
+module GNOME {
 module Evolution {
 	
 	interface Composer : Bonobo::Unknown {
@@ -20,7 +21,7 @@ module Evolution {
 		typedef sequence<Recipient> RecipientList;
 
 		/**
-		 * set_headers:
+		 * setHeaders:
 		 * @to: the "To" recipients
 		 * @cc: the "CC" recipients
 		 * @bcc: the "Bcc" recipients
@@ -30,31 +31,31 @@ module Evolution {
 		 * @bcc may be an empty list, and @subject may be an
 		 * empty string.
 		 **/
-		void set_headers (in RecipientList to, in RecipientList cc,
-				  in RecipientList bcc, in string subject);
+		void setHeaders (in RecipientList to, in RecipientList cc,
+				 in RecipientList bcc, in string subject);
 
 		/**
-		 * set_body_text:
+		 * setBodyText:
 		 * @body: the body
 		 *
 		 * Sets the text in the body of the composer to
 		 * the given UTF-8 plain text.
 		 **/
-		void set_body_text (in string body);
+		void setBodyText (in string body);
 
 		/**
-		 * attach_MIME:
+		 * attachMIME:
 		 * @data: the attachment data
 		 *
 		 * This adds an attachment to the composer. @data
 		 * should be a fully-formed MIME body part.
 		 **/
 		exception CouldNotParse {};
-		void attach_MIME (in string data)
+		void attachMIME (in string data)
 			raises (CouldNotParse);
 
 		/**
-		 * attach_data:
+		 * attachData:
 		 * @content_type: the Content-Type header
 		 * @filename: the suggested filename, or ""
 		 * @description: a description of the data, or ""
@@ -76,11 +77,11 @@ module Evolution {
 		 * all of the MIME headers yourself and use
 		 * add_attachment ().
 		 **/
-		void attach_data (in string content_type,
-				  in string filename,
-				  in string description,
-				  in boolean show_inline,
-				  in string data);
+		void attachData (in string content_type,
+				 in string filename,
+				 in string description,
+				 in boolean show_inline,
+				 in string data);
 
 
 		/**
@@ -92,3 +93,4 @@ module Evolution {
 		void show ();
 	};
 };
+};
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 144c3f85a8..d281725a83 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -19,11 +19,11 @@ HTML_EDITOR_GENERATED =		\
 selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names
 
 $(IDL_GENERATED): $(IDLS) $(selectnamesdir)/Evolution-Addressbook-SelectNames.idl
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
-		-I $(selectnamesdir) -I . $(srcdir)/Composer.idl
+	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
+		-I $(selectnamesdir)  $(srcdir)/Composer.idl
 
 $(HTML_EDITOR_GENERATED): $(GTK_HTML_EDITOR_IDL)
-	$(ORBIT_IDL) `$(GNOME_CONFIG) --cflags idl` $(GTK_HTML_EDITOR_IDL)
+	$(ORBIT_IDL) -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` $(GTK_HTML_EDITOR_IDL)
 
 ##
 
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index a73d69c733..1cd999c11f 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -44,7 +44,7 @@
 #define SELECT_NAMES_OAFID "OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61"
 
 struct _EMsgComposerHdrsPrivate {
-	Evolution_Addressbook_SelectNames corba_select_names;
+	GNOME_Evolution_Addressbook_SelectNames corba_select_names;
 
 	/* Total number of headers that we have.  */
 	guint num_hdrs;
@@ -119,7 +119,7 @@ address_button_clicked_cb (GtkButton *button,
 	CORBA_exception_init (&ev);
 
 	/* FIXME: Section ID */
-	Evolution_Addressbook_SelectNames_activate_dialog (priv->corba_select_names, "", &ev);
+	GNOME_Evolution_Addressbook_SelectNames_activateDialog (priv->corba_select_names, "", &ev);
 
 	CORBA_exception_free (&ev);
 }
@@ -183,7 +183,7 @@ create_addressbook_entry (EMsgComposerHdrs *hdrs,
 			  const char *name)
 {
 	EMsgComposerHdrsPrivate *priv;
-	Evolution_Addressbook_SelectNames corba_select_names;
+	GNOME_Evolution_Addressbook_SelectNames corba_select_names;
 	Bonobo_Control corba_control;
 	GtkWidget *control_widget;
 	CORBA_Environment ev;
@@ -193,13 +193,13 @@ create_addressbook_entry (EMsgComposerHdrs *hdrs,
 
 	CORBA_exception_init (&ev);
 
-	Evolution_Addressbook_SelectNames_add_section (corba_select_names, name, name, &ev);
+	GNOME_Evolution_Addressbook_SelectNames_addSection (corba_select_names, name, name, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		CORBA_exception_free (&ev);
 		return NULL;
 	}
 
-	corba_control = Evolution_Addressbook_SelectNames_get_entry_for_section (corba_select_names, name, &ev);
+	corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection (corba_select_names, name, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		CORBA_exception_free (&ev);
diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c
index f39482336c..c0e86ca227 100644
--- a/composer/evolution-composer.c
+++ b/composer/evolution-composer.c
@@ -38,12 +38,12 @@ static void (*postpone_cb) (EMsgComposer *, gpointer);
 
 /* CORBA interface implementation.  */
 
-static POA_Evolution_Composer__vepv Composer_vepv;
+static POA_GNOME_Evolution_Composer__vepv Composer_vepv;
 
 static GList *
-corba_recipientlist_to_glist (const Evolution_Composer_RecipientList *cl)
+corba_recipientlist_to_glist (const GNOME_Evolution_Composer_RecipientList *cl)
 {
-	Evolution_Composer_Recipient *recip;
+	GNOME_Evolution_Composer_Recipient *recip;
 	GList *gl = NULL;
 	char *str;
 	int i;
@@ -79,9 +79,9 @@ free_recipient_glist (GList *gl)
 
 static void
 impl_Composer_set_headers (PortableServer_Servant servant,
-			   const Evolution_Composer_RecipientList *to,
-			   const Evolution_Composer_RecipientList *cc,
-			   const Evolution_Composer_RecipientList *bcc,
+			   const GNOME_Evolution_Composer_RecipientList *to,
+			   const GNOME_Evolution_Composer_RecipientList *cc,
+			   const GNOME_Evolution_Composer_RecipientList *bcc,
 			   const CORBA_char *subject,
 			   CORBA_Environment *ev)
 {
@@ -140,7 +140,7 @@ impl_Composer_attach_MIME (PortableServer_Servant servant,
 
 	if (status == -1) {
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Composer_CouldNotParse,
+				     ex_GNOME_Evolution_Composer_CouldNotParse,
 				     NULL);
 		return;
 	}
@@ -193,17 +193,17 @@ impl_Composer_show (PortableServer_Servant servant,
 	gtk_widget_show (GTK_WIDGET (composer->composer));
 }
 
-POA_Evolution_Composer__epv *
+POA_GNOME_Evolution_Composer__epv *
 evolution_composer_get_epv (void)
 {
-	POA_Evolution_Composer__epv *epv;
+	POA_GNOME_Evolution_Composer__epv *epv;
 
-	epv = g_new0 (POA_Evolution_Composer__epv, 1);
-	epv->set_headers = impl_Composer_set_headers;
-	epv->set_body_text = impl_Composer_set_body_text;
-	epv->attach_MIME = impl_Composer_attach_MIME;
-	epv->attach_data = impl_Composer_attach_data;
-	epv->show = impl_Composer_show;
+	epv = g_new0 (POA_GNOME_Evolution_Composer__epv, 1);
+	epv->setHeaders  = impl_Composer_set_headers;
+	epv->setBodyText = impl_Composer_set_body_text;
+	epv->attachMIME  = impl_Composer_attach_MIME;
+	epv->attachData  = impl_Composer_attach_data;
+	epv->show        = impl_Composer_show;
 
 	return epv;
 }
@@ -233,7 +233,7 @@ class_init (EvolutionComposerClass *klass)
 	parent_class = gtk_type_class (bonobo_object_get_type ());
 
 	Composer_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	Composer_vepv.Evolution_Composer_epv = evolution_composer_get_epv ();
+	Composer_vepv.GNOME_Evolution_Composer_epv = evolution_composer_get_epv ();
 }
 
 static void
@@ -249,7 +249,7 @@ init (EvolutionComposer *composer)
 
 void
 evolution_composer_construct (EvolutionComposer *composer,
-			      Evolution_Composer corba_object)
+			      GNOME_Evolution_Composer corba_object)
 {
 	g_return_if_fail (composer != NULL);
 	g_return_if_fail (EVOLUTION_IS_COMPOSER (composer));
@@ -262,15 +262,15 @@ EvolutionComposer *
 evolution_composer_new (void)
 {
 	EvolutionComposer *new;
-	POA_Evolution_Composer *servant;
+	POA_GNOME_Evolution_Composer *servant;
 	CORBA_Environment ev;
-	Evolution_Composer corba_object;
+	GNOME_Evolution_Composer corba_object;
 
-	servant = (POA_Evolution_Composer *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Composer *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &Composer_vepv;
 
 	CORBA_exception_init (&ev);
-	POA_Evolution_Composer__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Composer__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
diff --git a/composer/evolution-composer.h b/composer/evolution-composer.h
index 6f248dae22..65f3f246d2 100644
--- a/composer/evolution-composer.h
+++ b/composer/evolution-composer.h
@@ -53,11 +53,11 @@ struct _EvolutionComposerClass {
 	BonoboObjectClass parent_class;
 };
 
-POA_Evolution_Composer__epv *evolution_composer_get_epv            (void);
+POA_GNOME_Evolution_Composer__epv *evolution_composer_get_epv            (void);
 
 GtkType            evolution_composer_get_type     (void);
 void               evolution_composer_construct    (EvolutionComposer *,
-						    Evolution_Composer);
+						    GNOME_Evolution_Composer);
 EvolutionComposer *evolution_composer_new          (void);
 
 void               evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),