Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.355
diff -u -p -r1.355 ChangeLog
--- ChangeLog	10 Jan 2006 07:59:03 -0000	1.355
+++ ChangeLog	11 Jan 2006 18:47:27 -0000
@@ -1,3 +1,11 @@
+2006-01-11  Harish Krishnaswamy  <kharish@novell.com>
+
+	* src/GNOME_Evolution_DataServer.server.in.in:
+	* src/server.c:
+	The Cal and Book Factory oafids should reflect
+	the API version rather than the BASE version.
+	Fixes #323115.
+
 2006-01-10  Simon Zheng  <simon.zheng@sun.com>
 
 	* docs/reference/camel/camel-sections.txt:
Index: src/GNOME_Evolution_DataServer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/src/GNOME_Evolution_DataServer.server.in.in,v
retrieving revision 1.8
diff -u -p -r1.8 GNOME_Evolution_DataServer.server.in.in
--- src/GNOME_Evolution_DataServer.server.in.in	6 Dec 2005 08:05:05 -0000	1.8
+++ src/GNOME_Evolution_DataServer.server.in.in	11 Jan 2006 18:47:27 -0000
@@ -1,11 +1,11 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_DataServer_BookFactory:@VERSION@"
+<oaf_server iid="OAFIID:GNOME_Evolution_DataServer_BookFactory:@API_VERSION@"
             type="exe"
             location="@LIBEXECDIR_IN_SERVER_FILE@/evolution-data-server-@VERSION@@EXEEXT@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/DataServer/BookFactory:@VERSION@"/>
+		<item value="IDL:GNOME/Evolution/DataServer/BookFactory:@API_VERSION@"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
@@ -13,12 +13,12 @@
                        _value="Evolution Addressbook file backend"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_DataServer_CalFactory:@VERSION@"
+<oaf_server iid="OAFIID:GNOME_Evolution_DataServer_CalFactory:@API_VERSION@"
             type="exe"
             location="@LIBEXECDIR_IN_SERVER_FILE@/evolution-data-server-@VERSION@@EXEEXT@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/DataServer/CalFactory:@VERSION@"/>
+		<item value="IDL:GNOME/Evolution/DataServer/CalFactory:@API_VERSION@"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
Index: src/server.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/src/server.c,v
retrieving revision 1.31
diff -u -p -r1.31 server.c
--- src/server.c	10 Jan 2006 07:59:04 -0000	1.31
+++ src/server.c	11 Jan 2006 18:47:27 -0000
@@ -58,8 +58,8 @@
 #define E_DATA_SERVER_INTERFACE_CHECK_OAF_ID "OAFIID:GNOME_Evolution_DataServer_InterfaceCheck"
 #define E_DATA_SERVER_LOGGING_OAF_ID "OAFIID:GNOME_Evolution_DataServer_Logging"
 
-#define E_DATA_CAL_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_DataServer_CalFactory:" BASE_VERSION
-#define E_DATA_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_DataServer_BookFactory:" BASE_VERSION
+#define E_DATA_CAL_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_DataServer_CalFactory:" API_VERSION
+#define E_DATA_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_DataServer_BookFactory:" API_VERSION
 
 /* The and addressbook calendar factories */
 
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.546
diff -u -p -r1.546 ChangeLog
--- calendar/ChangeLog	10 Jan 2006 07:55:33 -0000	1.546
+++ calendar/ChangeLog	11 Jan 2006 18:47:31 -0000
@@ -1,3 +1,10 @@
+2006-01-12  Harish Krishnaswamy  <kharish@novell.com>
+
+	* libecal/e-cal.c: (get_factories):
+	The Cal Factory oafid should reflect
+	the API version rather than the BASE version.
+	Fixes #323115.
+
 2006-01-10  Simon Zheng  <simon.zheng@sun.com>
 
 	* backends/file/e-cal-backend-file.c:
Index: calendar/libecal/e-cal.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal.c,v
retrieving revision 1.122
diff -u -p -r1.122 e-cal.c
--- calendar/libecal/e-cal.c	11 Dec 2005 07:42:42 -0000	1.122
+++ calendar/libecal/e-cal.c	11 Jan 2006 18:47:34 -0000
@@ -1070,7 +1070,7 @@ get_factories (const char *str_uri, GLis
 		return FALSE;
 	}
 
-	query = "repo_ids.has ('IDL:GNOME/Evolution/DataServer/CalFactory:" BASE_VERSION "')";
+	query = "repo_ids.has ('IDL:GNOME/Evolution/DataServer/CalFactory:" API_VERSION "')";
 
 	
 	servers = bonobo_activation_query (query, NULL, NULL);
Index: addressbook/libebook/e-book.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-book.c,v
retrieving revision 1.56
diff -u -p -r1.56 e-book.c
--- addressbook/libebook/e-book.c	9 Jan 2006 09:45:19 -0000	1.56
+++ addressbook/libebook/e-book.c	11 Jan 2006 18:47:35 -0000
@@ -3193,7 +3193,7 @@ activate_factories_for_uri (EBook *book,
 	char *query;
 	GList *factories = NULL;
 
-	query = "repo_ids.has ('IDL:GNOME/Evolution/DataServer/BookFactory:" BASE_VERSION "')";
+	query = "repo_ids.has ('IDL:GNOME/Evolution/DataServer/BookFactory:" API_VERSION "')";
 
 	CORBA_exception_init (&ev);
 	
