diff options
| -rw-r--r-- | addressbook/ChangeLog | 8 | ||||
| -rw-r--r-- | addressbook/gui/component/component-factory.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in | 4 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names-factory.c | 2 | ||||
| -rw-r--r-- | shell/ChangeLog | 5 |
5 files changed, 17 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 9697f9bda9..aea59ca0b2 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,13 @@ 2003-11-03 Ettore Perazzoli <ettore@ximian.com> + * gui/component/select-names/e-select-names-factory.c: Update + factory ID. + + * gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in: + Version the SelectNames server IDs by appending a "_2". + +2003-11-03 Ettore Perazzoli <ettore@ximian.com> + * gui/component/GNOME_Evolution_Addressbook.server.in.in: Change "evolution:config_item" into "evolution2:config_item". diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c index 573e0c1bb1..ae7ee670b8 100644 --- a/addressbook/gui/component/component-factory.c +++ b/addressbook/gui/component/component-factory.c @@ -41,7 +41,7 @@ #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" +#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" 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 80b138f1dc..9ef1c6d06d 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" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory_2" type="shlib" location="@COMPONENTDIR@/libevolution-addressbook.so"> @@ -15,7 +15,7 @@ </oaf_server> --> -<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames_2" type="factory" location="OAFIID:GNOME_Evolution_Addressbook_Factory_2"> 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 2416e42750..902449ba85 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" +#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory_2" static BonoboGenericFactory *factory = NULL; diff --git a/shell/ChangeLog b/shell/ChangeLog index 147c86ad81..68cd5346da 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,10 @@ 2003-11-03 Ettore Perazzoli <ettore@ximian.com> + * e-shell-shared-folder-picker-dialog.c (setup_name_selector): + Append "_2" to the SelectNames OAFIID. + +2003-11-03 Ettore Perazzoli <ettore@ximian.com> + * GNOME_Evolution_Shell.server.in.in: Use "evolution2:config_item" attributes instead of "evolution:config_item" ones. |