From 3cfa7824a8c01c979621965131319a8073f064ed Mon Sep 17 00:00:00 2001
From: Chris Toshok <toshok@ximian.com>
Date: Tue, 2 Oct 2001 22:37:58 +0000
Subject: add addressbook:supported_protocols containing just the file
 protocol.

2001-10-02  Chris Toshok  <toshok@ximian.com>

	* GNOME_Evolution_WombatNOLDAP.oaf.in: add
	addressbook:supported_protocols containing just the file protocol.

	* GNOME_Evolution_WombatLDAP.oaf.in: add
	addressbook:supported_protocols containing both ldap and file.

	* Makefile.am (OAF_IN_FILE): we have to possible files now, since
	the addressbook looks up factories by corba interface and the
	protocols supported by the factory (as listed in the .oaf file.)

	* .cvsignore: ignore GNOME_Evolution_Wombat.oaf.in, since it's
	generated now.

svn path=/trunk/; revision=13356
---
 wombat/.cvsignore                          |  1 +
 wombat/ChangeLog                           | 15 ++++++++
 wombat/GNOME_Evolution_Wombat.oaf.in       | 50 ---------------------------
 wombat/GNOME_Evolution_WombatLDAP.oaf.in   | 55 ++++++++++++++++++++++++++++++
 wombat/GNOME_Evolution_WombatNOLDAP.oaf.in | 54 +++++++++++++++++++++++++++++
 wombat/Makefile.am                         | 12 ++++++-
 6 files changed, 136 insertions(+), 51 deletions(-)
 delete mode 100644 wombat/GNOME_Evolution_Wombat.oaf.in
 create mode 100644 wombat/GNOME_Evolution_WombatLDAP.oaf.in
 create mode 100644 wombat/GNOME_Evolution_WombatNOLDAP.oaf.in

diff --git a/wombat/.cvsignore b/wombat/.cvsignore
index 7e93f6ace1..8f01d12584 100644
--- a/wombat/.cvsignore
+++ b/wombat/.cvsignore
@@ -12,3 +12,4 @@ wombat.h
 wombat
 wombat.pure
 GNOME_Evolution_Wombat.oaf
+GNOME_Evolution_Wombat.oaf.in
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 478c8a93db..1daa19d3bc 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,18 @@
+2001-10-02  Chris Toshok  <toshok@ximian.com>
+
+	* GNOME_Evolution_WombatNOLDAP.oaf.in: add
+	addressbook:supported_protocols containing just the file protocol.
+
+	* GNOME_Evolution_WombatLDAP.oaf.in: add
+	addressbook:supported_protocols containing both ldap and file.
+
+	* Makefile.am (OAF_IN_FILE): we have to possible files now, since
+	the addressbook looks up factories by corba interface and the
+	protocols supported by the factory (as listed in the .oaf file.)
+
+	* .cvsignore: ignore GNOME_Evolution_Wombat.oaf.in, since it's
+	generated now.
+	
 2001-09-26  Chris Toshok  <toshok@ximian.com>
 
 	* wombat.c (setup_pas): add OAFIID parameter to the call to the
diff --git a/wombat/GNOME_Evolution_Wombat.oaf.in b/wombat/GNOME_Evolution_Wombat.oaf.in
deleted file mode 100644
index d863204a35..0000000000
--- a/wombat/GNOME_Evolution_Wombat.oaf.in
+++ /dev/null
@@ -1,50 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory"
-            type="exe"
-            location="wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="The Personal Addressbook Server"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
-            type="exe"
-            location="wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="The Personal Calendar Server; calendar factory"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:Bonobo_Moniker_wombat_Factory" type="exe" location="wombat">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string" value="XML Database Moniker factory"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:Bonobo_Moniker_wombat" type="factory"
-	location="OAFIID:Bonobo_Moniker_wombat_Factory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Moniker:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" value="wombat Moniker"/>
-	<oaf_attribute name="bonobo:moniker" type="stringv">
-		<item value="wombat:"/>
-	</oaf_attribute>
-</oaf_server>
-
-</oaf_info>
diff --git a/wombat/GNOME_Evolution_WombatLDAP.oaf.in b/wombat/GNOME_Evolution_WombatLDAP.oaf.in
new file mode 100644
index 0000000000..6413a5b720
--- /dev/null
+++ b/wombat/GNOME_Evolution_WombatLDAP.oaf.in
@@ -0,0 +1,55 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory"
+            type="exe"
+            location="wombat">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       _value="The Personal Addressbook Server"/>
+
+        <oaf_attribute name="addressbook:supported_protocols" type="stringv">
+		<item value="ldap"/>
+		<item value="file"/>
+        </oaf_attribute>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
+            type="exe"
+            location="wombat">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       _value="The Personal Calendar Server; calendar factory"/>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:Bonobo_Moniker_wombat_Factory" type="exe" location="wombat">
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/GenericFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="name" type="string" value="XML Database Moniker factory"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:Bonobo_Moniker_wombat" type="factory"
+	location="OAFIID:Bonobo_Moniker_wombat_Factory">
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Bonobo/Moniker:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="name" type="string" value="wombat Moniker"/>
+	<oaf_attribute name="bonobo:moniker" type="stringv">
+		<item value="wombat:"/>
+	</oaf_attribute>
+</oaf_server>
+
+</oaf_info>
diff --git a/wombat/GNOME_Evolution_WombatNOLDAP.oaf.in b/wombat/GNOME_Evolution_WombatNOLDAP.oaf.in
new file mode 100644
index 0000000000..60f897a98f
--- /dev/null
+++ b/wombat/GNOME_Evolution_WombatNOLDAP.oaf.in
@@ -0,0 +1,54 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory"
+            type="exe"
+            location="wombat">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       _value="The Personal Addressbook Server"/>
+
+        <oaf_attribute name="addressbook:supported_protocols" type="stringv">
+		<item value="file"/>
+        </oaf_attribute>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
+            type="exe"
+            location="wombat">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       _value="The Personal Calendar Server; calendar factory"/>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:Bonobo_Moniker_wombat_Factory" type="exe" location="wombat">
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/GenericFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="name" type="string" value="XML Database Moniker factory"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:Bonobo_Moniker_wombat" type="factory"
+	location="OAFIID:Bonobo_Moniker_wombat_Factory">
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Bonobo/Moniker:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="name" type="string" value="wombat Moniker"/>
+	<oaf_attribute name="bonobo:moniker" type="stringv">
+		<item value="wombat:"/>
+	</oaf_attribute>
+</oaf_server>
+
+</oaf_info>
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index be09560e64..648d199d30 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -43,13 +43,23 @@ wombat_LDADD =							\
 
 oafdir = $(datadir)/oaf
 
+if ENABLE_LDAP
+OAF_IN_FILE=GNOME_Evolution_WombatLDAP.oaf.in
+else
+OAF_IN_FILE=GNOME_Evolution_WombatNOLDAP.oaf.in
+endif
+
+GNOME_Evolution_Wombat.oaf.in: $(OAF_IN_FILE)
+	cp $< $@
+
 oaf_in_files = GNOME_Evolution_Wombat.oaf.in
 oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
 
 @XML_I18N_MERGE_OAF_RULE@
 
 
-EXTRA_DIST = $(oaf_DATA) $(oaf_in_files) wombat.idl
+EXTRA_DIST = $(oaf_DATA) $(oaf_in_files) wombat.idl \
+	     GNOME_Evolution_WombatLDAP.oaf.in GNOME_Evolution_WombatNOLDAP.oaf.in
 
 if ENABLE_PURIFY
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-- 
cgit v1.2.3