aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog13
-rw-r--r--addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in42
-rw-r--r--addressbook/gui/component/addressbook-config.c4
-rw-r--r--addressbook/gui/component/addressbook.c2
-rw-r--r--addressbook/gui/component/component-factory.c16
-rw-r--r--addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in8
-rw-r--r--addressbook/gui/component/select-names/e-select-names-bonobo.c2
-rw-r--r--addressbook/gui/component/select-names/e-select-names-factory.c2
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c2
-rw-r--r--addressbook/gui/widgets/eab-vcard-control.c2
10 files changed, 53 insertions, 40 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 09:05:35 +0800