diff options
58 files changed, 267 insertions, 188 deletions
@@ -1,3 +1,9 @@ +2003-12-01 Rodney Dawes <dobey@ximian.com> + + * tools/killev.c: Use BASE_VERSION for repo_ids and OAFIIDs, + Update gnome-spell repo_id to correct version, + Update gtkhtml editor OAFIID to GtkHTML 3.1 + 2003-12-01 JP Rosevear <jpr@ximian.com> * configure.in: define privconduitdir diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 17532785b0..9944021a1d 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,16 @@ +2003-12-01 Rodney Dawes <dobey@ximian.com> + + * gui/component/GNOME_Evolution_Addressbook.server.in.in: + * gui/component/addressbook-config.c: + * gui/component/addressbook.c: + * gui/component/component-factory.c: + * gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in: + * gui/component/select-names/e-select-names-bonobo.c: + * gui/component/select-names/e-select-names-factory.c: + * gui/widgets/eab-gui-util.c: + * gui/widgets/eab-vcard-control.c: Use BASE_VERSION for repo_ids and + OAFIIDs + 2003-12-01 Hans Petter Jansson <hpj@ximian.com> * gui/component/ldap-config.glade: Fix start page text. diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in index 110c80e3db..df47e0cffe 100644 --- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in +++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Factory_2" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@" type="shlib" location="@COMPONENTDIR@/libevolution-addressbook.so"> @@ -13,9 +13,9 @@ </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Control" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Control:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Addressbook_Factory_2"> + location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:Bonobo/Control:1.0"/> @@ -32,12 +32,12 @@ </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Control_2" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Control:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Addressbook_Factory_2"> + location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:BonoboControl/addressbook-control:1.0"/> + <item value="IDL:BonoboControl/addressbook-control:@VERSION@"/> <item value="IDL:GNOME/Control:1.0"/> </oaf_attribute> @@ -46,12 +46,12 @@ </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Component" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Component:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Addressbook_Factory_2"> + location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/Component:1.0"/> + <item value="IDL:GNOME/Evolution/Component:@VERSION@"/> </oaf_attribute> <oaf_attribute name="name" type="string" @@ -65,12 +65,12 @@ </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidget" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidget:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Addressbook_Factory_2"> + location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:BonoboControl/address-widget:1.0"/> + <item value="IDL:BonoboControl/address-widget:@VERSION@"/> <item value="IDL:GNOME/Control:1.0"/> </oaf_attribute> @@ -79,12 +79,12 @@ </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressPopup" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressPopup:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Addressbook_Factory_2"> + location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:BonoboControl/address-widget:1.0"/> + <item value="IDL:BonoboControl/address-widget:@VERSION@"/> <item value="IDL:GNOME/Control:1.0"/> </oaf_attribute> @@ -93,12 +93,12 @@ </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl" +<oaf_server iid="OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Addressbook_Factory_2"> + location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/> + <item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution2:config_item:title" type="string" @@ -121,12 +121,12 @@ </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_SMime_CertificateManager_ConfigControl" +<oaf_server iid="OAFIID:GNOME_Evolution_SMime_CertificateManager_ConfigControl:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Addressbook_Factory_2"> + location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/> + <item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution2:config_item:title" type="string" diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index bc6b406787..7bd11f677e 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -45,8 +45,8 @@ #define LDAPS_PORT_STRING "636" #define GLADE_FILE_NAME "ldap-config.glade" -#define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory" -#define LDAP_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl" +#define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory:" BASE_VERSION +#define LDAP_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl:" BASE_VERSION GtkWidget* supported_bases_create_table (char *name, char *string1, char *string2, int num1, int num2); diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index f2f921c606..8e8dfa8f5f 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -903,7 +903,7 @@ retrieve_shell_view_interface_from_control (BonoboControl *control) CORBA_exception_init (&ev); shell_view_interface = Bonobo_Unknown_queryInterface (control_frame, - "IDL:GNOME/Evolution/ShellView:1.0", + "IDL:GNOME/Evolution/ShellView:" BASE_VERSION, &ev); CORBA_exception_free (&ev); diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c index a230db4277..82a766d070 100644 --- a/addressbook/gui/component/component-factory.c +++ b/addressbook/gui/component/component-factory.c @@ -35,15 +35,15 @@ #include <bonobo/bonobo-shlib-factory.h> -#define FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_Factory_2" +#define FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_Factory:" BASE_VERSION -#define VCARD_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_VCard_Control" -#define ADDRESSBOOK_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_Control" -#define COMPONENT_ID "OAFIID:GNOME_Evolution_Addressbook_Component" -#define ADDRESS_POPUP_ID "OAFIID:GNOME_Evolution_Addressbook_AddressPopup" -#define SELECT_NAMES_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNames_2" -#define LDAP_STORAGE_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl" -#define CERTIFICATE_MANAGER_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_SMime_CertificateManager_ConfigControl" +#define VCARD_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_VCard_Control:" BASE_VERSION +#define ADDRESSBOOK_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_Control:" BASE_VERSION +#define COMPONENT_ID "OAFIID:GNOME_Evolution_Addressbook_Component:" BASE_VERSION +#define ADDRESS_POPUP_ID "OAFIID:GNOME_Evolution_Addressbook_AddressPopup:" BASE_VERSION +#define SELECT_NAMES_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION +#define LDAP_STORAGE_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl:" BASE_VERSION +#define CERTIFICATE_MANAGER_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_SMime_CertificateManager_ConfigControl:" BASE_VERSION static BonoboObject * diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in index 9ef1c6d06d..0a9f975463 100644 --- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in +++ b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in @@ -1,7 +1,7 @@ <oaf_info> <!-- -<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory_2" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory:@VERSION@" type="shlib" location="@COMPONENTDIR@/libevolution-addressbook.so"> @@ -15,12 +15,12 @@ </oaf_server> --> -<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames_2" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Addressbook_Factory_2"> + location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/> + <item value="IDL:GNOME/Evolution/Addressbook/SelectNames:@VERSION@"/> </oaf_attribute> <oaf_attribute name="name" type="string" diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c index f10fa3b804..73c415c6c6 100644 --- a/addressbook/gui/component/select-names/e-select-names-bonobo.c +++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c @@ -500,7 +500,7 @@ impl_SelectNames_activate_dialog (PortableServer_Servant servant, priv = select_names->priv; shell = bonobo_activation_activate_from_id ( - "OAFIID:GNOME_Evolution_Shell", + "OAFIID:GNOME_Evolution_Shell:" BASE_VERSION, Bonobo_ACTIVATION_FLAG_EXISTING_ONLY, NULL, ev); if (BONOBO_EX (ev)) diff --git a/addressbook/gui/component/select-names/e-select-names-factory.c b/addressbook/gui/component/select-names/e-select-names-factory.c index 902449ba85..9e427513e0 100644 --- a/addressbook/gui/component/select-names/e-select-names-factory.c +++ b/addressbook/gui/component/select-names/e-select-names-factory.c @@ -30,7 +30,7 @@ #include "e-select-names-factory.h" -#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory_2" +#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory:" BASE_VERSION static BonoboGenericFactory *factory = NULL; diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 666bc976f2..4fe37e6f73 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -558,7 +558,7 @@ eab_transfer_contacts (EBook *source, GList *contacts /* adopted */, gboolean de #include <Evolution-Composer.h> -#define COMPOSER_OAFID "OAFIID:GNOME_Evolution_Mail_Composer" +#define COMPOSER_OAFID "OAFIID:GNOME_Evolution_Mail_Composer:" BASE_VERSION void eab_send_contact_list (GList *contacts, EABDisposition disposition) diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c index 8e4235d78e..c161333f15 100644 --- a/addressbook/gui/widgets/eab-vcard-control.c +++ b/addressbook/gui/widgets/eab-vcard-control.c @@ -49,7 +49,7 @@ typedef struct { EABContactDisplayRenderMode render_mode; } EABVCardControl; -#define VCARD_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_VCard_Control" +#define VCARD_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_VCard_Control:" BASE_VERSION /* * Bonobo::PersistStream diff --git a/calendar/ChangeLog b/calendar/ChangeLog index e53ae085b9..f6f5f58841 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,21 @@ +2003-12-01 Rodney Dawes <dobey@ximian.com> + + * gui/GNOME_Evolution_Calendar.server.in.in: + * gui/calendar-commands.c: + * gui/e-meeting-list-view.c: + * gui/e-meeting-model.c: + * gui/e-select-names-editable.c: + * gui/itip-bonobo-control.c: + * gui/itip-utils.c: + * gui/main.c: + * gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in: + * gui/alarm-notify/alarm-queue.c: + * gui/alarm-notify/notify-main.c: + * gui/dialogs/alarm-options.c: + * gui/dialogs/e-delegate-dialog.c: + * importers/GNOME_Evolution_Calendar_Importer.server.in.in: + * importers/main.c: Use BASE_VERSION for repo_ids and OAFIIDs + 2003-12-01 JP Rosevear <jpr@ximian.com> * conduits/todo/Makefile.am: put the conduits in their own dir diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in.in b/calendar/gui/GNOME_Evolution_Calendar.server.in.in index d43faeed38..cee3a6a103 100644 --- a/calendar/gui/GNOME_Evolution_Calendar.server.in.in +++ b/calendar/gui/GNOME_Evolution_Calendar.server.in.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Factory_2" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@" type="shlib" location="@COMPONENTDIR@/libevolution-calendar.so"> @@ -13,9 +13,9 @@ </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Calendar_Factory_2"> + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:Bonobo/Control:1.0"/> @@ -31,12 +31,12 @@ _value="Evolution Calendar scheduling message viewer"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Component" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Component:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Calendar_Factory_2"> + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/Component:1.0"/> + <item value="IDL:GNOME/Evolution/Component:@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution:component_alias" type="string" value="calendar"/> @@ -48,12 +48,12 @@ <oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Calendar_Factory_2"> + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:BonoboControl/calendar-control:1.0"/> + <item value="IDL:BonoboControl/calendar-control:@VERSION@"/> <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Bonobo/PropertyBag:1.0"/> </oaf_attribute> @@ -66,12 +66,12 @@ _value="Evolution Calendar viewer"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Component" +<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Component:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Calendar_Factory_2"> + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/Component:1.0"/> + <item value="IDL:GNOME/Evolution/Component:@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution:component_alias" type="string" value="tasks"/> @@ -83,12 +83,12 @@ <oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control" +<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Calendar_Factory_2"> + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:BonoboControl/tasks-control:1.0"/> + <item value="IDL:BonoboControl/tasks-control:@VERSION@"/> <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Bonobo/PropertyBag:1.0"/> </oaf_attribute> @@ -101,12 +101,12 @@ _value="Evolution Tasks viewer"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Calendar_Factory_2"> + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/Calendar/CompEditorFactory:1.0"/> + <item value="IDL:GNOME/Evolution/Calendar/CompEditorFactory:@VERSION@"/> <item value="IDL:Bonobo/Unknown:1.0"/> </oaf_attribute> @@ -114,12 +114,12 @@ _value="Evolution Calendar/Task editor"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Calendar_Factory_2"> + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/> + <item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution2:config_item:title" type="string" diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in index b5620db42c..3c43c4ca54 100644 --- a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in +++ b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_2" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify:@VERSION@" type="exe" location="@LIBEXECDIR@/evolution-alarm-notify"> diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 9a426f4f9d..2cf95f47b7 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -625,7 +625,7 @@ edit_component (ECal *client, ECalComponent *comp) /* Get the factory */ CORBA_exception_init (&ev); - factory = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory", + factory = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:" BASE_VERSION, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION) { diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c index e70f01b44b..6897d00857 100644 --- a/calendar/gui/alarm-notify/notify-main.c +++ b/calendar/gui/alarm-notify/notify-main.c @@ -163,7 +163,7 @@ main (int argc, char **argv) gnome_sound_init ("localhost"); - factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify_2", + factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify:" BASE_VERSION, (BonoboFactoryCallback) alarm_notify_factory_fn, NULL); if (!factory) g_error (_("Could not create the alarm notify service factory")); diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index e5a66df378..5f9038fd72 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -413,7 +413,7 @@ get_shell_view_interface (BonoboControl *control) CORBA_exception_init (&ev); shell_view = Bonobo_Unknown_queryInterface (control_frame, - "IDL:GNOME/Evolution/ShellView:1.0", + "IDL:GNOME/Evolution/ShellView:" BASE_VERSION, &ev); if (BONOBO_EX (&ev)) { g_message ("get_shell_view_interface(): " diff --git a/calendar/gui/dialogs/alarm-options.c b/calendar/gui/dialogs/alarm-options.c index f664d8d31f..512020d4d6 100644 --- a/calendar/gui/dialogs/alarm-options.c +++ b/calendar/gui/dialogs/alarm-options.c @@ -87,7 +87,7 @@ typedef struct { GtkWidget *palarm_args; } Dialog; -#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames_2" +#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION static const char *section_name = "Send To"; diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c index 546f95a499..1a33ca194d 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.c +++ b/calendar/gui/dialogs/e-delegate-dialog.c @@ -53,7 +53,7 @@ struct _EDelegateDialogPrivate { GtkWidget *entry; }; -#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames_2" +#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION static const char *section_name = "Delegate To"; static void e_delegate_dialog_class_init (EDelegateDialogClass *class); diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 903b16f126..5613f6adea 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -46,7 +46,7 @@ #include <addressbook/util/eab-destination.h> #include "e-select-names-renderer.h" -#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames_2" +#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION struct _EMeetingListViewPrivate { diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c index 1a67594eca..559ede9b6c 100644 --- a/calendar/gui/e-meeting-model.c +++ b/calendar/gui/e-meeting-model.c @@ -49,7 +49,7 @@ #include "e-meeting-attendee.h" #include "e-meeting-model.h" -#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames_2" +#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION struct _EMeetingModelPrivate { diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c index 9b55e67bf6..cf2cd1d661 100644 --- a/calendar/gui/e-select-names-editable.c +++ b/calendar/gui/e-select-names-editable.c @@ -30,7 +30,7 @@ #include "e-select-names-editable.h" #include "Evolution-Addressbook-SelectNames.h" -#define SELECT_NAMES_OAFIID "OAFIID:GNOME_Evolution_Addressbook_SelectNames_2" +#define SELECT_NAMES_OAFIID "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION struct _ESelectNamesEditablePriv { GNOME_Evolution_Addressbook_SelectNames select_names; diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c index cb52bb579b..391bc1f73d 100644 --- a/calendar/gui/itip-bonobo-control.c +++ b/calendar/gui/itip-bonobo-control.c @@ -250,7 +250,7 @@ itip_bonobo_control_new (void) stream = bonobo_persist_stream_new (pstream_load, pstream_save, pstream_get_content_types, - "OAFIID:GNOME_Evolution_Calendar_iTip_Control", + "OAFIID:GNOME_Evolution_Calendar_iTip_Control:" BASE_VERSION, itip); if (stream == NULL) { diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index bcbb6a5880..30e95dbcfe 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -40,7 +40,7 @@ #include "calendar-config.h" #include "itip-utils.h" -#define GNOME_EVOLUTION_COMPOSER_OAFIID "OAFIID:GNOME_Evolution_Mail_Composer" +#define GNOME_EVOLUTION_COMPOSER_OAFIID "OAFIID:GNOME_Evolution_Mail_Composer:" BASE_VERSION static gchar *itip_methods[] = { "PUBLISH", diff --git a/calendar/gui/main.c b/calendar/gui/main.c index 1e76b65580..404cec6622 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -50,15 +50,15 @@ #include "tasks-component.h" -#define FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_Factory_2" +#define FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_Factory:" BASE_VERSION -#define CALENDAR_COMPONENT_ID "OAFIID:GNOME_Evolution_Calendar_Component" -#define CALENDAR_CONTROL_ID "OAFIID:GNOME_Evolution_Calendar_Control" -#define TASKS_COMPONENT_ID "OAFIID:GNOME_Evolution_Tasks_Component" -#define TASKS_CONTROL_ID "OAFIID:GNOME_Evolution_Tasks_Control" -#define ITIP_CONTROL_ID "OAFIID:GNOME_Evolution_Calendar_iTip_Control" -#define CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Calendar_ConfigControl" -#define COMP_EDITOR_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_CompEditorFactory" +#define CALENDAR_COMPONENT_ID "OAFIID:GNOME_Evolution_Calendar_Component:" BASE_VERSION +#define CALENDAR_CONTROL_ID "OAFIID:GNOME_Evolution_Calendar_Control:" BASE_VERSION +#define TASKS_COMPONENT_ID "OAFIID:GNOME_Evolution_Tasks_Component:" BASE_VERSION +#define TASKS_CONTROL_ID "OAFIID:GNOME_Evolution_Tasks_Control:" BASE_VERSION +#define ITIP_CONTROL_ID "OAFIID:GNOME_Evolution_Calendar_iTip_Control:" BASE_VERSION +#define CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Calendar_ConfigControl:" BASE_VERSION +#define COMP_EDITOR_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:" BASE_VERSION ECompEditorRegistry *comp_editor_registry = NULL; @@ -99,7 +99,7 @@ launch_alarm_daemon_cb (gpointer data) /* activate the alarm daemon */ CORBA_exception_init (&ev); - an = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify_2", 0, NULL, &ev); + an = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify:" BASE_VERSION, 0, NULL, &ev); if (BONOBO_EX (&ev)) { g_message ("launch_alarm_daemon_cb(): Could not activate the alarm notification service"); diff --git a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in index d99aba4647..810905fbfa 100644 --- a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in +++ b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ImporterFactory" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ImporterFactory:@VERSION@" type="shlib" location="@IMPORTERSDIR@/libevolution-calendar-importers.so"> @@ -11,12 +11,12 @@ _value="Evolution iCalendar importer"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory"> + location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/Importer:1.0"/> + <item value="IDL:GNOME/Evolution/Importer:@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution:menu_name" type="string" _value="iCalendar files (.ics)"/> @@ -25,12 +25,12 @@ </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory"> + location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/Importer:1.0"/> + <item value="IDL:GNOME/Evolution/Importer:@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution:menu_name" type="string" _value="vCalendar files (.vcf)"/> @@ -39,12 +39,12 @@ </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer" +<oaf_server iid="OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory"> + location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/> + <item value="IDL:GNOME/Evolution/IntelligentImporter:@VERSION@"/> </oaf_attribute> <oaf_attribute name="name" type="string" diff --git a/calendar/importers/main.c b/calendar/importers/main.c index ba62d63f8b..d19f98a271 100644 --- a/calendar/importers/main.c +++ b/calendar/importers/main.c @@ -29,10 +29,10 @@ #include <bonobo/bonobo-main.h> #include "evolution-calendar-importer.h" -#define IMPORTER_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ImporterFactory" -#define ICALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer" -#define VCALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer" -#define GNOME_CALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer" +#define IMPORTER_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ImporterFactory:" BASE_VERSION +#define ICALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer:" BASE_VERSION +#define VCALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer:" BASE_VERSION +#define GNOME_CALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer:" BASE_VERSION static BonoboObject * importer_factory_fn (BonoboGenericFactory *factory, const char *id, void *closure) diff --git a/composer/ChangeLog b/composer/ChangeLog index 653ed19a83..5122c2c48a 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,7 @@ +2003-12-01 Rodney Dawes <dobey@ximian.com> + + * e-msg-composer-hdrs.h: Use BASE_VERSION for repo_ids and OAFIIDs + 2003-11-11 Radek Doulik <rodo@ximian.com> * e-msg-composer.c (e_msg_composer_set_autosaved): new method to diff --git a/composer/e-msg-composer-hdrs.h b/composer/e-msg-composer-hdrs.h index 2f1cea7624..f3bedb1c34 100644 --- a/composer/e-msg-composer-hdrs.h +++ b/composer/e-msg-composer-hdrs.h @@ -45,7 +45,7 @@ extern "C" { #define E_IS_MSG_COMPOSER_HDRS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_HDRS)) -#define SELECT_NAMES_OAFIID "OAFIID:GNOME_Evolution_Addressbook_SelectNames_2" +#define SELECT_NAMES_OAFIID "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION typedef struct _EMsgComposerHdrs EMsgComposerHdrs; typedef struct _EMsgComposerHdrsClass EMsgComposerHdrsClass; diff --git a/mail/ChangeLog b/mail/ChangeLog index 9e8554cc40..8d1e933446 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,19 @@ +2003-12-01 Rodney Dawes <dobey@ximian.com> + + * GNOME_Evlution_Mail.server.in.in: + * em-account-prefs.c: + * em-composer-prefs.c: + * em-mailer-prefs.h: + * mail-component-factory.c: + * mail-config-factory.c: + * mail-font-prefs.h: + * importers/*.server.in.in: + * importers/elm-importer.c: + * importers/evolution-mbox-importer.c: + * importers/evolution-outlook-importer.c: + * importers/netscape-importer.c: + * importers/pine-importer.c: Use BASE_VERSION for repo_ids and OAFIIDs + 2003-12-01 Jeffrey Stedfast <fejj@ximian.com> * em-composer-utils.c (composer_get_message): rfc2047 encode the diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in index 328b70587f..b52a80267b 100644 --- a/mail/GNOME_Evolution_Mail.server.in.in +++ b/mail/GNOME_Evolution_Mail.server.in.in @@ -3,7 +3,7 @@ <!-- Folder display control --> <!-- (factory) --> - <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Factory_2" + <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@" type="shlib" location="@COMPONENTDIR@/libevolution-mail.so"> @@ -16,12 +16,12 @@ </oaf_server> <!-- (control) --> - <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control" + <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Mail_ControlFactory"> + location="OAFIID:GNOME_Evolution_Mail_ControlFactory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:BonoboControl/evolution-mail:1.0"/> + <item value="IDL:BonoboControl/evolution-mail:@VERSION@"/> <item value="IDL:GNOME/Control:1.0"/> </oaf_attribute> @@ -31,12 +31,12 @@ <!-- Component Interface --> - <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Component_2" + <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Component:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Mail_Factory_2"> + location="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/Component:1.0"/> + <item value="IDL:GNOME/Evolution/Component:@VERSION@"/> </oaf_attribute> <oaf_attribute name="name" type="string" _value="Evolution Mail component"/> @@ -57,12 +57,12 @@ <!-- Shell Component --> - <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponent" + <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponent:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Mail_ControlFactory"> + location="OAFIID:GNOME_Evolution_Mail_ControlFactory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/> + <item value="IDL:GNOME/Evolution/ShellComponent:@VERSION@"/> </oaf_attribute> <oaf_attribute name="name" type="string" @@ -77,12 +77,12 @@ <!-- Message composer --> <!-- (composer) --> - <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Composer" + <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Composer:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Mail_Factory_2"> + location="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution:Composer:1.0"/> + <item value="IDL:GNOME/Evolution:Composer:@VERSION@"/> <item value="IDL:Bonobo/ItemContainer:1.0"/> </oaf_attribute> @@ -93,12 +93,12 @@ <!-- Startup Wizard --> <!-- (wizard) --> - <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Wizard" + <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Wizard:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Mail_ControlFactory"> + location="OAFIID:GNOME_Evolution_Mail_ControlFactory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/StartupWizard:1.0"/> + <item value="IDL:GNOME/Evolution/StartupWizard::@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution:startup_wizard:priority" type="number" @@ -109,12 +109,12 @@ <!-- Configuration pages --> <!-- Account Editor --> - <oaf_server iid="OAFIID:GNOME_Evolution_Mail_AccountPrefs_ConfigControl_2" + <oaf_server iid="OAFIID:GNOME_Evolution_Mail_AccountPrefs_ConfigControl:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Mail_Factory_2"> + location="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/> + <item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution2:config_item:title" type="string" @@ -138,12 +138,12 @@ </oaf_server> <!-- Mailer Preferences --> - <oaf_server iid="OAFIID:GNOME_Evolution_Mail_MailerPrefs_ConfigControl_2" + <oaf_server iid="OAFIID:GNOME_Evolution_Mail_MailerPrefs_ConfigControl:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Mail_Factory_2"> + location="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/> + <item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution2:config_item:title" type="string" @@ -163,12 +163,12 @@ </oaf_server> <!-- Composer Preferences --> - <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl_2" + <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Mail_Factory_2"> + location="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/> + <item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution2:config_item:title" type="string" diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h index 1fa3b66d58..cff22fdc51 100644 --- a/mail/em-account-prefs.h +++ b/mail/em-account-prefs.h @@ -90,7 +90,7 @@ GtkWidget *em_account_prefs_new (GNOME_Evolution_Shell shell); void em_account_prefs_apply (EMAccountPrefs *prefs); /* needed by global config */ -#define EM_ACCOUNT_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_AccountPrefs_ConfigControl_2" +#define EM_ACCOUNT_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_AccountPrefs_ConfigControl:" BASE_VERSION #ifdef __cplusplus } diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h index e3582d6031..70b5eb15eb 100644 --- a/mail/em-composer-prefs.h +++ b/mail/em-composer-prefs.h @@ -121,7 +121,7 @@ void em_composer_prefs_apply (EMComposerPrefs *prefs); MailConfigSignature *em_composer_prefs_new_signature (GtkWindow *parent, gboolean html, const char *script); /* needed by global config */ -#define EM_COMPOSER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl_2" +#define EM_COMPOSER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl:" BASE_VERSION #ifdef __cplusplus } diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h index acd6e88d07..0555d03b06 100644 --- a/mail/em-mailer-prefs.h +++ b/mail/em-mailer-prefs.h @@ -115,7 +115,7 @@ GtkWidget *em_mailer_prefs_new (void); void em_mailer_prefs_apply (EMMailerPrefs *prefs); /* needed by global config */ -#define EM_MAILER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_MailerPrefs_ConfigControl_2" +#define EM_MAILER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_MailerPrefs_ConfigControl:" BASE_VERSION #ifdef __cplusplus } diff --git a/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in index 7b2e60b8f2..c9f1c985d1 100644 --- a/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in +++ b/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory" +<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory:@VERSION@" type="exe" location="@BINDIR@/evolution-@VERSION@"> @@ -12,12 +12,12 @@ _value="Evolution Elm importer"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer" +<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory"> + location="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/> + <item value="IDL:GNOME/Evolution/IntelligentImporter:@VERSION@"/> </oaf_attribute> <oaf_attribute name="name" type="string" diff --git a/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in index 5b2096d3ea..72e634bd6a 100644 --- a/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in +++ b/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory" +<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory:@VERSION@" type="exe" location="@BINDIR@/evolution-@VERSION@"> @@ -12,12 +12,12 @@ _value="Evolution mbox importer"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_Importer" +<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_Importer:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory"> + location="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/Importer:1.0"/> + <item value="IDL:GNOME/Evolution/Importer:@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution:menu_name" type="string" diff --git a/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in index 795e441098..83302a5402 100644 --- a/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in +++ b/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory" +<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory:@VERSION@" type="exe" location="@BINDIR@/evolution-@VERSION@"> @@ -12,12 +12,12 @@ _value="Evolution Netscape Mail importer"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer" +<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory"> + location="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/> + <item value="IDL:GNOME/Evolution/IntelligentImporter:@VERSION@"/> </oaf_attribute> <oaf_attribute name="name" type="string" diff --git a/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in index 1dc90779f8..49963ca2a6 100644 --- a/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in +++ b/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory" +<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory:@VERSION@" type="exe" location="@BINDIR@/evolution-@VERSION@"> @@ -12,12 +12,12 @@ _value="Evolution Outlook Express 4 importer"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_Importer" +<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_Importer:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"> + location="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/Importer:1.0"/> + <item value="IDL:GNOME/Evolution/Importer:@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution:menu_name" type="string" diff --git a/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in index 5cdf7cbe35..b81789c291 100644 --- a/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in +++ b/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory" +<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory:@VERSION@" type="exe" location="@BINDIR@/evolution-@VERSION@"> @@ -12,12 +12,12 @@ _value="Evolution Pine importer"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer" +<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory"> + location="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/> + <item value="IDL:GNOME/Evolution/IntelligentImporter:@VERSION@"/> </oaf_attribute> <oaf_attribute name="name" type="string" diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index bfe2ffcd95..1386e3a26f 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -54,8 +54,8 @@ #include "mail/mail-importer.h" -#define ELM_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory" -#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer" +#define ELM_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory:" BASE_VERSION +#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer:" BASE_VERSION #define KEY "elm-mail-imported" /*#define SUPER_IMPORTER_DEBUG*/ diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index 134f6b9233..83323703af 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -55,7 +55,7 @@ #define OUT #endif -#define MBOX_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory" +#define MBOX_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory:" BASE_VERSION typedef struct { MailImporter importer; /* Parent */ diff --git a/mail/importers/evolution-outlook-importer.c b/mail/importers/evolution-outlook-importer.c index 1b250fc8ff..62d99bb149 100644 --- a/mail/importers/evolution-outlook-importer.c +++ b/mail/importers/evolution-outlook-importer.c @@ -41,7 +41,7 @@ #include "mail-tools.h" -#define OUTLOOK_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory" +#define OUTLOOK_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory:" BASE_VERSION extern char *evolution_dir; typedef struct { diff --git a/mail/importers/netscape-importer.c b/mail/importers/netscape-importer.c index 650e2432a3..a0610ca1b4 100644 --- a/mail/importers/netscape-importer.c +++ b/mail/importers/netscape-importer.c @@ -74,9 +74,9 @@ EvolutionShellClient *global_shell_client = NULL; static char *filter_name = N_("Priority Filter \"%s\""); -#define FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory" -#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer" -#define MAIL_CONFIG_IID "OAFIID:GNOME_Evolution_MailConfig" +#define FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory:" BASE_VERSION +#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer:" BASE_VERSION +#define MAIL_CONFIG_IID "OAFIID:GNOME_Evolution_MailConfig:" BASE_VERSION #define KEY "netscape-mail-imported" diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index 54ffe2e51c..89cfcc2fdc 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -59,8 +59,8 @@ #include <ebook/e-book.h> #include <ebook/e-card-simple.h> -#define PINE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory" -#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer" +#define PINE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory:" BASE_VERSION +#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer:" BASE_VERSION #define KEY "pine-mail-imported" /*#define SUPER_IMPORTER_DEBUG*/ diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c index b779329926..cd3416de85 100644 --- a/mail/mail-component-factory.c +++ b/mail/mail-component-factory.c @@ -45,13 +45,13 @@ #include <string.h> -#define FACTORY_ID "OAFIID:GNOME_Evolution_Mail_Factory_2" +#define FACTORY_ID "OAFIID:GNOME_Evolution_Mail_Factory:" BASE_VERSION -#define COMPONENT_ID "OAFIID:GNOME_Evolution_Mail_Component_2" -#define COMPOSER_ID "OAFIID:GNOME_Evolution_Mail_Composer" -#define FOLDER_INFO_ID "OAFIID:GNOME_Evolution_FolderInfo" -#define MAIL_CONFIG_ID "OAFIID:GNOME_Evolution_MailConfig" -#define WIZARD_ID "OAFIID:GNOME_Evolution_Mail_Wizard" +#define COMPONENT_ID "OAFIID:GNOME_Evolution_Mail_Component:" BASE_VERSION +#define COMPOSER_ID "OAFIID:GNOME_Evolution_Mail_Composer:" BASE_VERSION +#define FOLDER_INFO_ID "OAFIID:GNOME_Evolution_FolderInfo:" BASE_VERSION +#define MAIL_CONFIG_ID "OAFIID:GNOME_Evolution_MailConfig:" BASE_VERSION +#define WIZARD_ID "OAFIID:GNOME_Evolution_Mail_Wizard:" BASE_VERSION static BonoboObject * diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c index e2c205de94..9a6170796a 100644 --- a/mail/mail-config-factory.c +++ b/mail/mail-config-factory.c @@ -33,7 +33,7 @@ #include "mail-config-factory.h" -#define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ConfigControlFactory" +#define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ConfigControlFactory:" BASE_VERSION typedef void (*ApplyFunc) (GtkWidget *prefs); diff --git a/mail/mail-font-prefs.h b/mail/mail-font-prefs.h index 14a1d20b40..87266734a9 100644 --- a/mail/mail-font-prefs.h +++ b/mail/mail-font-prefs.h @@ -58,7 +58,7 @@ GtkType mail_font_prefs_get_type (void); GtkWidget * mail_font_prefs_new (void); void mail_font_prefs_apply (MailFontPrefs *prefs); -#define MAIL_FONT_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_FontPrefs_ConfigControl" +#define MAIL_FONT_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_FontPrefs_ConfigControl:" BASE_VERSION #ifdef __cplusplus } diff --git a/shell/ChangeLog b/shell/ChangeLog index 0ab18beb32..b71cc589b7 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,15 @@ +2003-12-01 Rodney Dawes <dobey@ximian.com> + + * GNOME_Evolution_Shell.server.in.in: + * e-component-registry.c: + * e-shell-config.c: + * e-shell-shared-folder-picker-dialog.c: + * e-shell-startup-wizard.c: + * e-shell.h: + * e-user-creatable-items-handler.c: + * evolution-activity-client.c: + * evolution-storage.c: Use BASE_VERSION for repo_ids and OAFIIDs + 2003-11-30 Ettore Perazzoli <ettore@ximian.com> * e-shell.c (struct _EShellPrivate): New member offline_handler. diff --git a/shell/GNOME_Evolution_Shell.server.in.in b/shell/GNOME_Evolution_Shell.server.in.in index 73de19f1b3..6462c92a96 100644 --- a/shell/GNOME_Evolution_Shell.server.in.in +++ b/shell/GNOME_Evolution_Shell.server.in.in @@ -1,32 +1,32 @@ <oaf_info> - <oaf_server iid="OAFIID:GNOME_Evolution_Shell_2" + <oaf_server iid="OAFIID:GNOME_Evolution_Shell:@VERSION@" type="exe" location="@BINDIR@/evolution-@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/Shell:1.0"/> + <item value="IDL:GNOME/Evolution/Shell:@VERSION@"/> </oaf_attribute> <oaf_attribute name="name" type="string" _value="Evolution Shell"/> </oaf_server> - <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_Factory_2" + <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_Factory:@VERSION@" type="exe" - location="evolution-exchange-storage"> + location="@BINDIR@/evolution-@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/GenericFactory:1.0"/> </oaf_attribute> </oaf_server> - <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_FolderSettings_Control_2" + <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_FolderSettings_Control:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Shell_Config_Factory"> + location="OAFIID:GNOME_Evolution_Shell_Config_Factory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/> + <item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/> </oaf_attribute> <oaf_attribute name="evolution2:config_item:title" type="string" diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index 71170f8e82..b1a6560078 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -130,11 +130,14 @@ query_components (EComponentRegistry *registry) Bonobo_ServerInfoList *info_list; CORBA_Environment ev; GSList *language_list; + char *query; int i; CORBA_exception_init (&ev); + query = g_strdup_printf ("repo_ids.has ('IDL:GNOME/Evolution/Component:%s')", BASE_VERSION); + info_list = bonobo_activation_query (query, NULL, &ev); + g_free (query); - info_list = bonobo_activation_query ("repo_ids.has ('IDL:GNOME/Evolution/Component:1.0')", NULL, &ev); if (BONOBO_EX (&ev)) { char *ex_text = bonobo_exception_get_text (&ev); g_warning ("Cannot query for components: %s\n", ex_text); diff --git a/shell/e-shell-config.c b/shell/e-shell-config.c index 5eba72280d..27a2fbd937 100644 --- a/shell/e-shell-config.c +++ b/shell/e-shell-config.c @@ -32,9 +32,9 @@ #include <bonobo/bonobo-generic-factory.h> -#define E_SHELL_CONFIG_FACTORY_OAFIID "OAFIID:GNOME_Evolution_Shell_Config_Factory" +#define E_SHELL_CONFIG_FACTORY_OAFIID "OAFIID:GNOME_Evolution_Shell_Config_Factory:" BASE_VERSION -#define E_SHELL_CONFIG_FOLDER_SETTINGS_OAFIID "OAFIID:GNOME_Evolution_Shell_Config_FolderSettings_Control" +#define E_SHELL_CONFIG_FOLDER_SETTINGS_OAFIID "OAFIID:GNOME_Evolution_Shell_Config_FolderSettings_Control:" BASE_VERSION static BonoboObject * diff --git a/shell/e-shell-shared-folder-picker-dialog.c b/shell/e-shell-shared-folder-picker-dialog.c index e8444e81d6..1bf651f25f 100644 --- a/shell/e-shell-shared-folder-picker-dialog.c +++ b/shell/e-shell-shared-folder-picker-dialog.c @@ -111,7 +111,7 @@ setup_name_selector (GladeXML *glade_xml, CORBA_exception_init (&ev); - corba_iface = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Addressbook_SelectNames_2", + corba_iface = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION, 0, NULL, &ev); if (corba_iface == CORBA_OBJECT_NIL || BONOBO_EX (&ev)) { g_warning ("Cannot activate SelectNames -- %s", BONOBO_EX_REPOID (&ev)); diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c index 63460cc68b..ac6d6a4770 100644 --- a/shell/e-shell-startup-wizard.c +++ b/shell/e-shell-startup-wizard.c @@ -142,10 +142,14 @@ start_wizard (void) Bonobo_ServerInfoList *info; CORBA_Environment ev; GNOME_Evolution_Wizard wizard; + char *query; int i; CORBA_exception_init (&ev); - info = bonobo_activation_query ("repo_ids.has ('IDL:GNOME/Evolution/StartupWizard:1.0')", selection_order, &ev); + query = g_strdup_printf ("repo_ids.has ('IDL:GNOME/Evolution/StartupWizard:%s')", BASE_VERSION); + info = bonobo_activation_query (query, selection_order, &ev); + g_free (query); + if (BONOBO_EX (&ev) || info == CORBA_OBJECT_NIL) { g_warning ("Cannot find startup wizard -- %s", BONOBO_EX_REPOID (&ev)); CORBA_exception_free (&ev); @@ -513,10 +517,13 @@ get_intelligent_importers (void) Bonobo_ServerInfoList *info_list; GList *iids_ret = NULL; CORBA_Environment ev; + char *query; int i; CORBA_exception_init (&ev); - info_list = bonobo_activation_query ("repo_ids.has ('IDL:GNOME/Evolution/IntelligentImporter:1.0')", NULL, &ev); + query = g_strdup_printf ("repo_ids.has ('IDL:GNOME/Evolution/IntelligentImporter:%s'", BASE_VERSION); + info_list = bonobo_activation_query (query, NULL, &ev); + g_free (query); CORBA_exception_free (&ev); for (i = 0; i < info_list->_length; i++) { diff --git a/shell/e-shell.h b/shell/e-shell.h index 499b31728e..b8922de39d 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -81,7 +81,7 @@ struct _EShellClass { /* ID for registering the shell in the OAF name service. */ -#define E_SHELL_OAFIID "OAFIID:GNOME_Evolution_Shell_2" +#define E_SHELL_OAFIID "OAFIID:GNOME_Evolution_Shell:" BASE_VERSION enum _EShellConstructResult { E_SHELL_CONSTRUCT_RESULT_OK, diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index 91ab84647c..f45bb5183d 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -54,7 +54,7 @@ static GObjectClass *parent_class = NULL; #define VERB_PREFIX "ShellUserCreatableItemVerb" -#define EVOLUTION_MAIL_OAFIID "OAFIID:GNOME_Evolution_Mail_ShellComponent" +#define EVOLUTION_MAIL_OAFIID "OAFIID:GNOME_Evolution_Mail_ShellComponent:" BASE_VERSION #define SHELL_WINDOW_KEY "EUserCreatableItemsHandler:shell_window" #define COMBO_BUTTON_WIDGET_KEY "EUserCreatableItemsHandler:combo_button" diff --git a/shell/evolution-activity-client.c b/shell/evolution-activity-client.c index 584ad6e15a..9b2fc8da70 100644 --- a/shell/evolution-activity-client.c +++ b/shell/evolution-activity-client.c @@ -142,7 +142,7 @@ static CORBA_Object get_shell_activity_iface (GNOME_Evolution_Shell shell_iface) { CORBA_Object iface_object; - const char *iface_name = "IDL:GNOME/Evolution/Activity:1.0"; + const char *iface_name = "IDL:GNOME/Evolution/Activity:" BASE_VERSION; iface_object = bonobo_object_query_remote (shell_iface, iface_name, NULL); if (iface_object == CORBA_OBJECT_NIL) diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c index b083e5d794..6ea4fddead 100644 --- a/shell/evolution-storage.c +++ b/shell/evolution-storage.c @@ -937,7 +937,7 @@ evolution_storage_register_on_shell (EvolutionStorage *evolution_storage, CORBA_exception_init (&ev); corba_storage_registry = Bonobo_Unknown_queryInterface (corba_shell, - "IDL:GNOME/Evolution/StorageRegistry:1.0", + "IDL:GNOME/Evolution/StorageRegistry:" BASE_VERSION, &ev); if (corba_storage_registry == CORBA_OBJECT_NIL || ev._major != CORBA_NO_EXCEPTION) { CORBA_exception_free (&ev); @@ -975,7 +975,7 @@ evolution_storage_deregister_on_shell (EvolutionStorage *evolution_storage, CORBA_exception_init (&ev); corba_storage_registry = Bonobo_Unknown_queryInterface (corba_shell, - "IDL:GNOME/Evolution/StorageRegistry:1.0", + "IDL:GNOME/Evolution/StorageRegistry:" BASE_VERSION, &ev); if (corba_storage_registry == CORBA_OBJECT_NIL || ev._major != CORBA_NO_EXCEPTION) { CORBA_exception_free (&ev); diff --git a/tools/killev.c b/tools/killev.c index a0ee32efde..4415174420 100644 --- a/tools/killev.c +++ b/tools/killev.c @@ -199,18 +199,18 @@ main (int argc, char **argv) languages = e_get_language_list (); components = g_hash_table_new (g_str_hash, g_str_equal); - add_matching_repo_id ("IDL:GNOME/Evolution/Shell:1.0"); + add_matching_repo_id ("IDL:GNOME/Evolution/Shell:" BASE_VERSION); g_hash_table_foreach_remove (components, kill_component, NULL); - add_matching_repo_id ("IDL:GNOME/Evolution/ShellComponent:1.0"); - add_matching_repo_id ("IDL:GNOME/Evolution/Calendar/CalFactory:1.0"); - add_matching_repo_id ("IDL:GNOME/Evolution/BookFactory:1.0"); - add_matching_repo_id ("IDL:GNOME/Evolution/Importer:1.0"); - add_matching_repo_id ("IDL:GNOME/Evolution/IntelligentImporter:1.0"); - add_matching_repo_id ("IDL:GNOME/Spell/Checker:0.1"); + add_matching_repo_id ("IDL:GNOME/Evolution/ShellComponent:" BASE_VERSION); + add_matching_repo_id ("IDL:GNOME/Evolution/Calendar/CalFactory:" BASE_VERSION); + add_matching_repo_id ("IDL:GNOME/Evolution/BookFactory:" BASE_VERSION); + add_matching_repo_id ("IDL:GNOME/Evolution/Importer:" BASE_VERSION); + add_matching_repo_id ("IDL:GNOME/Evolution/IntelligentImporter:" BASE_VERSION); + add_matching_repo_id ("IDL:GNOME/Spell/Dictionary:0.3"); - add_matching_iid ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify_2"); - add_matching_iid ("OAFIID:GNOME_GtkHTML_Editor_Factory:3.0"); + add_matching_iid ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify:" BASE_VERSION); + add_matching_iid ("OAFIID:GNOME_GtkHTML_Editor_Factory:3.1"); g_hash_table_foreach_remove (components, kill_component, NULL); |