diff options
Diffstat (limited to 'addressbook')
5 files changed, 20 insertions, 10 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index b74468b05d..0bfdfb1dc3 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,13 @@ +2004-06-04 JP Rosevear <jpr@novell.com> + + Fixes #55945 + + * importers/*.server.in.in: ditto + + * importers/evolution-ldif-importer.c: fix OAFIIDs + + * importers/evolution-vcard-importer.c: ditto + 2004-06-04 Chris Toshok <toshok@ximian.com> * gui/component/select-names/e-select-names-model.c diff --git a/addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in b/addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in index f397674fd3..954ff9eece 100644 --- a/addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in +++ b/addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory:@VERSION@" type="shlib" location="@IMPORTERSDIR@/libevolution-addressbook-ldif-importer.so"> @@ -12,9 +12,9 @@ _value="Evolution LDIF importer"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory"> + location="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/Importer:@VERSION@"/> diff --git a/addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in b/addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in index 1d434fbab9..d0eb3f94d4 100644 --- a/addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in +++ b/addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory:@VERSION@" type="shlib" location="@IMPORTERSDIR@/libevolution-addressbook-vcard-importer.so"> @@ -12,9 +12,9 @@ _value="Evolution VCard importer"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Importer" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Importer:@VERSION@" type="factory" - location="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"> + location="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory:@VERSION@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/Importer:@VERSION@"/> diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index a19c229ae5..eb6fb63825 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -34,8 +34,8 @@ #include <widgets/misc/e-source-selector.h> #include <util/e-destination.h> -#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory" -#define COMPONENT_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer" +#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory:" BASE_VERSION +#define COMPONENT_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer:" BASE_VERSION static GHashTable *dn_contact_hash; diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index 3a580029ef..985f06be9e 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -48,8 +48,8 @@ #include <util/eab-book-util.h> #include <util/e-destination.h> -#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory" -#define COMPONENT_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_Importer" +#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory:" BASE_VERSION +#define COMPONENT_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_Importer:" BASE_VERSION typedef struct { ESource *primary; |