From 7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0 Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Mon, 1 Dec 2003 22:14:43 +0000 Subject: Use BASE_VERSION for repo_ids and OAFIIDs Update killev to kill the 2003-12-01 Rodney Dawes * Use BASE_VERSION for repo_ids and OAFIIDs * Update killev to kill the correct versions of gnome-spell and the GtkHTML Editor svn path=/trunk/; revision=23543 --- calendar/gui/GNOME_Evolution_Calendar.server.in.in | 42 +++++++++++----------- ...OME_Evolution_Calendar_AlarmNotify.server.in.in | 2 +- calendar/gui/alarm-notify/alarm-queue.c | 2 +- calendar/gui/alarm-notify/notify-main.c | 2 +- calendar/gui/calendar-commands.c | 2 +- calendar/gui/dialogs/alarm-options.c | 2 +- calendar/gui/dialogs/e-delegate-dialog.c | 2 +- calendar/gui/e-meeting-list-view.c | 2 +- calendar/gui/e-meeting-model.c | 2 +- calendar/gui/e-select-names-editable.c | 2 +- calendar/gui/itip-bonobo-control.c | 2 +- calendar/gui/itip-utils.c | 2 +- calendar/gui/main.c | 18 +++++----- 13 files changed, 41 insertions(+), 41 deletions(-) (limited to 'calendar/gui') 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 @@ - @@ -13,9 +13,9 @@ - + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> @@ -31,12 +31,12 @@ _value="Evolution Calendar scheduling message viewer"/> - + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> - + @@ -48,12 +48,12 @@ - + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> - + @@ -66,12 +66,12 @@ _value="Evolution Calendar viewer"/> - + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> - + @@ -83,12 +83,12 @@ - + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> - + @@ -101,12 +101,12 @@ _value="Evolution Tasks viewer"/> - + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> - + @@ -114,12 +114,12 @@ _value="Evolution Calendar/Task editor"/> - + location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"> - + - 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 #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"); -- cgit