diff options
| author | Harish Krishnaswamy <kharish@novell.com> | 2006-01-12 10:17:30 +0000 |
|---|---|---|
| committer | Harish Krishnaswamy <kharish@src.gnome.org> | 2006-01-12 10:17:30 +0000 |
| commit | b9a8aa383d5c1446f66ff1b26ea0d6fb1091f79a (patch) | |
| tree | 1f7dadb203d1d14d5c2b4cc9b80a0279fb4ed0c1 | |
| parent | 706bcf85a2f216b8cfde9500b89af3d815605e18 (diff) | |
| download | evolution-data-server-b9a8aa383d5c1446f66ff1b26ea0d6fb1091f79a.tar.gz | |
The Cal and Book Factory oafids should reflect the API version rather than
2006-01-12 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.
* libecal/e-cal.c: (get_factories): The Cal Factory oafid should
reflect the API version rather than the BASE version.
* libebook/e-book.c: (activate_factories_for_uri): The Book Factory
oafid should reflect the API version rather than the BASE version.
Fixes #323115.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/libebook/e-book.c | 2 | ||||
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/libecal/e-cal.c | 2 | ||||
| -rw-r--r-- | src/GNOME_Evolution_DataServer.server.in.in | 8 | ||||
| -rw-r--r-- | src/server.c | 4 |
7 files changed, 30 insertions, 8 deletions
@@ -1,3 +1,11 @@ +2006-01-12 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. + 2005-11-30 Harish Krishnaswamy <kharish@novell.com> * configure.in : Updated 1.4.2.1 release with a fix for a crasher diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index cc1e792a9..d4b021a49 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2006-01-12 Harish Krishnaswamy <kharish@novell.com> + + * libebook/e-book.c: (activate_factories_for_uri): + The Book Factory oafid should reflect + the API version rather than the BASE version. + Fixes #323115. + 2005-10-26 Ross Burton <ross@burtonini.com> * libebook/e-destination.c: diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c index 2730bca51..6d1b82439 100644 --- a/addressbook/libebook/e-book.c +++ b/addressbook/libebook/e-book.c @@ -3192,7 +3192,7 @@ activate_factories_for_uri (EBook *book, const char *uri) 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); diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a3e9d7fc3..f314e05c3 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -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-02 Chenthill Palanisamy <pchenthill@novell.com> Reviewed by Harish Krishnaswamy <kharish@novell.com> diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c index 1d0547a69..e45b21784 100644 --- a/calendar/libecal/e-cal.c +++ b/calendar/libecal/e-cal.c @@ -1070,7 +1070,7 @@ get_factories (const char *str_uri, GList **factories) 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); diff --git a/src/GNOME_Evolution_DataServer.server.in.in b/src/GNOME_Evolution_DataServer.server.in.in index 109e13071..ae020003a 100644 --- a/src/GNOME_Evolution_DataServer.server.in.in +++ b/src/GNOME_Evolution_DataServer.server.in.in @@ -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@/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@/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> diff --git a/src/server.c b/src/server.c index ab0e039cb..4680f18f2 100644 --- a/src/server.c +++ b/src/server.c @@ -54,8 +54,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 */ |