aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorRodney Dawes <dobey@ximian.com>2003-12-02 06:14:43 +0800
committerRodney Dawes <dobey@src.gnome.org>2003-12-02 06:14:43 +0800
commit7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0 (patch)
tree7bd84d8e6b28d1d4e0a4d4d7959aa2bd2dbdecae /shell
parent9b6e4f3e85115055b3df938cb0bdf7876575c952 (diff)
downloadgsoc2013-evolution-7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0.tar.gz
gsoc2013-evolution-7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0.tar.zst
gsoc2013-evolution-7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0.zip
Use BASE_VERSION for repo_ids and OAFIIDs Update killev to kill the
2003-12-01 Rodney Dawes <dobey@ximian.com> * 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
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog12
-rw-r--r--shell/GNOME_Evolution_Shell.server.in.in14
-rw-r--r--shell/e-component-registry.c5
-rw-r--r--shell/e-shell-config.c4
-rw-r--r--shell/e-shell-shared-folder-picker-dialog.c2
-rw-r--r--shell/e-shell-startup-wizard.c11
-rw-r--r--shell/e-shell.h2
-rw-r--r--shell/e-user-creatable-items-handler.c2
-rw-r--r--shell/evolution-activity-client.c2
-rw-r--r--shell/evolution-storage.c4
10 files changed, 40 insertions, 18 deletions
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);