Index: evolution-data-server/servers/exchange/storage/exchange-constants.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/exchange-constants.h,v
retrieving revision 1.2
diff -u -p -r1.2 exchange-constants.h
--- evolution-data-server/servers/exchange/storage/exchange-constants.h	10 Jun 2005 10:51:09 -0000	1.2
+++ evolution-data-server/servers/exchange/storage/exchange-constants.h	14 Jan 2006 09:30:09 -0000
@@ -20,8 +20,8 @@ typedef enum {
 
 #define EXCHANGE_COMPONENT_FACTORY_IID  "OAFIID:GNOME_Evolution_Exchange_Component_Factory:" BASE_VERSION
 #define EXCHANGE_COMPONENT_IID		"OAFIID:GNOME_Evolution_Exchange_Component:" BASE_VERSION
-#define EXCHANGE_CALENDAR_FACTORY_ID	"OAFIID:GNOME_Evolution_Exchange_Connector_CalFactory:" BASE_VERSION
-#define EXCHANGE_ADDRESSBOOK_FACTORY_ID	"OAFIID:GNOME_Evolution_Exchange_Connector_BookFactory:" BASE_VERSION
+#define EXCHANGE_CALENDAR_FACTORY_ID	"OAFIID:GNOME_Evolution_Exchange_Connector_CalFactory:" API_VERSION
+#define EXCHANGE_ADDRESSBOOK_FACTORY_ID	"OAFIID:GNOME_Evolution_Exchange_Connector_BookFactory:" API_VERSION
 #define EXCHANGE_AUTOCONFIG_WIZARD_ID	"OAFIID:GNOME_Evolution_Exchange_Connector_Startup_Wizard:" BASE_VERSION
 
 #endif
Index: evolution-exchange/configure.in
===================================================================
RCS file: /cvs/gnome/evolution-exchange/configure.in,v
retrieving revision 1.98
diff -u -p -r1.98 configure.in
--- evolution-exchange/configure.in	2 Jan 2006 15:30:38 -0000	1.98
+++ evolution-exchange/configure.in	14 Jan 2006 09:31:10 -0000
@@ -38,6 +38,10 @@ AC_DEFINE_UNQUOTED(EVOLUTION_BASE_VERSIO
 BASE_VERSION=$EVOLUTION_API_VERSION
 AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", Connector base version)
 AC_SUBST(BASE_VERSION)
+
+API_VERSION=$EDS_API_VERSION
+AC_DEFINE_UNQUOTED(API_VERSION, "$API_VERSION", Eds api version)
+AC_SUBST(API_VERSION)
 AC_SUBST(EDS_BASE_VERSION)
 
 dnl Initialize maintainer mode
Index: evolution-exchange/storage/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/Makefile.am,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.am
--- evolution-exchange/storage/Makefile.am	7 Dec 2005 09:10:04 -0000	1.27
+++ evolution-exchange/storage/Makefile.am	14 Jan 2006 09:32:23 -0000
@@ -83,6 +83,7 @@ server_DATA = $(server_in_files:.server.
 	sed -e "s;\@CONNECTOR_PATH\@;${EVOLUTION_privlibexecdir};g"	\
 	    -e "s;\@IMAGESDIR\@;${imagesdir};g"				\
 	    -e "s;\@BASE_VERSION\@;${BASE_VERSION};g"			\
+	    -e "s;\@API_VERSION\@;${API_VERSION};g"			\
 	    -e "s;\@EDS_BASE_VERSION\@;${EDS_BASE_VERSION};g"		\
 	    < $< > $@
 
Index: evolution-exchange/storage/exchange-component.h
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/exchange-component.h,v
retrieving revision 1.10
diff -u -p -r1.10 exchange-component.h
--- evolution-exchange/storage/exchange-component.h	22 Aug 2005 15:24:14 -0000	1.10
+++ evolution-exchange/storage/exchange-component.h	14 Jan 2006 09:32:42 -0000
@@ -56,8 +56,8 @@ void exchange_component_set_factories (E
 
 #define EXCHANGE_COMPONENT_FACTORY_IID  "OAFIID:GNOME_Evolution_Exchange_Component_Factory:" BASE_VERSION
 #define EXCHANGE_COMPONENT_IID		"OAFIID:GNOME_Evolution_Exchange_Component:" BASE_VERSION
-#define EXCHANGE_CALENDAR_FACTORY_ID	"OAFIID:GNOME_Evolution_Exchange_Connector_CalFactory:" BASE_VERSION
-#define EXCHANGE_ADDRESSBOOK_FACTORY_ID	"OAFIID:GNOME_Evolution_Exchange_Connector_BookFactory:" BASE_VERSION
+#define EXCHANGE_CALENDAR_FACTORY_ID	"OAFIID:GNOME_Evolution_Exchange_Connector_CalFactory:" API_VERSION
+#define EXCHANGE_ADDRESSBOOK_FACTORY_ID	"OAFIID:GNOME_Evolution_Exchange_Connector_BookFactory:" API_VERSION
 #define EXCHANGE_AUTOCONFIG_WIZARD_ID	"OAFIID:GNOME_Evolution_Exchange_Connector_Startup_Wizard:" BASE_VERSION
 
 #ifdef __cplusplus
Index: evolution-exchange/storage/GNOME_Evolution_Exchange_Storage.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/GNOME_Evolution_Exchange_Storage.server.in.in,v
retrieving revision 1.8
diff -u -p -r1.8 GNOME_Evolution_Exchange_Storage.server.in.in
--- evolution-exchange/storage/GNOME_Evolution_Exchange_Storage.server.in.in	27 Oct 2005 09:28:32 -0000	1.8
+++ evolution-exchange/storage/GNOME_Evolution_Exchange_Storage.server.in.in	14 Jan 2006 09:34:18 -0000
@@ -38,7 +38,7 @@
 -->
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Exchange_Connector_BookFactory:@BASE_VERSION@"
+<oaf_server iid="OAFIID:GNOME_Evolution_Exchange_Connector_BookFactory:@API_VERSION@"
             type="exe"
             location="@CONNECTOR_PATH@/evolution-exchange-storage">
 
@@ -56,7 +56,7 @@
         </oaf_attribute>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Exchange_Connector_CalFactory:@BASE_VERSION@"
+<oaf_server iid="OAFIID:GNOME_Evolution_Exchange_Connector_CalFactory:@API_VERSION@"
             type="exe"
             location="@CONNECTOR_PATH@/evolution-exchange-storage">
 
