diff options
| -rw-r--r-- | wombat/ChangeLog | 13 | ||||
| -rw-r--r-- | wombat/GNOME_Evolution_WombatLDAP.server.in.in | 1 | ||||
| -rw-r--r-- | wombat/GNOME_Evolution_WombatNOLDAP.server.in.in | 3 | ||||
| -rw-r--r-- | wombat/Makefile.am | 11 | ||||
| -rw-r--r-- | wombat/wombat.c | 11 |
5 files changed, 24 insertions, 15 deletions
diff --git a/wombat/ChangeLog b/wombat/ChangeLog index b96d759db7..af0d35440f 100644 --- a/wombat/ChangeLog +++ b/wombat/ChangeLog @@ -1,3 +1,16 @@ +2003-10-21 Chris Toshok <toshok@ximian.com> + + * GNOME_Evolution_WombatLDAP.server.in.in: add vcf to + supported_protocols. + + * GNOME_Evolution_WombatNOLDAP.server.in.in: same. + + * wombat.c (setup_pas): register the vcf backend. + + * Makefile.am (evolution_wombat_LDADD): replace the conditional + libpasldap stuff and the references to all the libpas* backends + with libpas.la. + 2003-10-15 Rodrigo Moya <rodrigo@ximian.com> * wombat.c (termination_handler): re-enabled the call to diff --git a/wombat/GNOME_Evolution_WombatLDAP.server.in.in b/wombat/GNOME_Evolution_WombatLDAP.server.in.in index 6e6e02bc80..b82fe26803 100644 --- a/wombat/GNOME_Evolution_WombatLDAP.server.in.in +++ b/wombat/GNOME_Evolution_WombatLDAP.server.in.in @@ -15,6 +15,7 @@ <oaf_attribute name="addressbook:supported_protocols" type="stringv"> <item value="ldap"/> <item value="file"/> + <item value="vcf"/> </oaf_attribute> </oaf_server> diff --git a/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in b/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in index 9e30130e53..c6a7a83a82 100644 --- a/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in +++ b/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in @@ -10,10 +10,11 @@ </oaf_attribute> <oaf_attribute name="name" type="string" - _value="Evolution Addressbook local file backend"/> + _value="Evolution Addressbook local backend"/> <oaf_attribute name="addressbook:supported_protocols" type="stringv"> <item value="file"/> + <item value="vcf"/> </oaf_attribute> </oaf_server> diff --git a/wombat/Makefile.am b/wombat/Makefile.am index 73c18e01ed..c66f38382c 100644 --- a/wombat/Makefile.am +++ b/wombat/Makefile.am @@ -43,17 +43,8 @@ evolution_wombat_SOURCES = \ wombat-interface-check.h \ wombat.c -if ENABLE_LDAP -LDAP_STUFF = \ - $(top_builddir)/addressbook/backend/pas/libpasldap.a \ - $(LDAP_LIBS) -endif - evolution_wombat_LDADD = \ - $(top_builddir)/addressbook/backend/pas/libpasfile.a \ - $(DB3_LDADD) \ - $(LDAP_STUFF) \ - $(top_builddir)/addressbook/backend/pas/libpas.a \ + $(top_builddir)/addressbook/backend/pas/libpas.la \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/calendar/pcs/libpcsfile.a \ $(top_builddir)/calendar/pcs/libpcs.a \ diff --git a/wombat/wombat.c b/wombat/wombat.c index 4dc6c6b60e..c11c8fe78f 100644 --- a/wombat/wombat.c +++ b/wombat/wombat.c @@ -29,6 +29,10 @@ #include "pas/pas-book-factory.h" #include "pas/pas-backend-file.h" +#include "pas/pas-backend-vcf.h" +#ifdef HAVE_LDAP +#include "pas/pas-backend-ldap.h" +#endif #include "calendar/pcs/cal-factory.h" #include "calendar/pcs/cal-backend-file-events.h" @@ -36,10 +40,6 @@ #include "wombat-interface-check.h" -#ifdef HAVE_LDAP -#include "pas/pas-backend-ldap.h" -#endif - #define CAL_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_CalendarFactory" #define PAS_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory" @@ -104,6 +104,9 @@ setup_pas (void) pas_book_factory_register_backend ( pas_book_factory, "file", pas_backend_file_new); + pas_book_factory_register_backend ( + pas_book_factory, "vcf", pas_backend_vcf_new); + #ifdef HAVE_LDAP pas_book_factory_register_backend ( pas_book_factory, "ldap", pas_backend_ldap_new); |