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/main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'calendar/gui/main.c') 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 v1.2.3