callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add vcf to supported_protocols.

Browse Source 
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.

svn path=/trunk/; revision=22999
This commit is contained in:
Chris Toshok
2003-10-22 20:49:45 +00:00
committed by Chris Toshok
parent 998e8acf8d
commit f7cbb839ad
5 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wombat/ChangeLog
View File

@ -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

1
wombat/GNOME_Evolution_WombatLDAP.server.in.in
View File

@ -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>

3
wombat/GNOME_Evolution_WombatNOLDAP.server.in.in
View File

@ -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>

11
wombat/Makefile.am
View File

@ -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 \

11
wombat/wombat.c
View File

@ -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);