From 8c15217286f43b10280f0ab7466c890e55e7b822 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Tue, 4 Nov 2003 21:53:03 +0000 Subject: [PATCH] properly name space the oaf ids 2003-11-04 JP Rosevear * src/server.c: properly name space the oaf ids * src/server-interface-check.c: use the correctly named poa * src/server-interface-check.h: ditto * src/GNOME_Evolution_DataServerLDAP.server.in.in: name space the factories and interface check better * src/GNOME_Evolution_DataServerNOLDAP.server.in.in: ditto * src/Evolution-DataServer.idl: name space the interface check properly 2003-11-04 JP Rosvear * libedatabook/e-data-book-factory.c: use properly name spaced default id * libebook/e-book.c: kill unneccesary define 2003-11-04 JP Rosevear * libedatacal/e-data-cal-factory.c: use properly name spaced default id --- ChangeLog | 18 +++++++++++++++++- addressbook/ChangeLog | 7 +++++++ addressbook/libebook/e-book.c | 4 +--- addressbook/libedata-book/e-data-book-factory.c | 2 +- addressbook/libedatabook/e-data-book-factory.c | 2 +- calendar/ChangeLog | 5 +++++ calendar/libedata-cal/e-data-cal-factory.c | 2 +- calendar/libedatacal/e-data-cal-factory.c | 2 +- src/Evolution-DataServer.idl | 6 ++++-- src/GNOME_Evolution_DataServerLDAP.server.in.in | 10 +++++----- src/GNOME_Evolution_DataServerNOLDAP.server.in.in | 10 +++++----- src/server-interface-check.c | 2 +- src/server-interface-check.h | 2 +- src/server.c | 8 +++++--- 14 files changed, 55 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 905f99f..092ae7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,20 @@ -2003-11-04 JP Rosevear +2003-11-04 + + * src/server.c: properly name space the oaf ids + + * src/server-interface-check.c: use the correctly named poa + + * src/server-interface-check.h: ditto + + * src/GNOME_Evolution_DataServerLDAP.server.in.in: name space the + factories and interface check better + + * src/GNOME_Evolution_DataServerNOLDAP.server.in.in: ditto + + * src/Evolution-DataServer.idl: name space the interface check + properly + +2003-11-04 JP Rosevear * src/Evolution-DataServer.idl: server interface check instead of wombat interface check diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 6b47ec7..47527ea 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2003-11-04 JP Rosvear + + * libedatabook/e-data-book-factory.c: use properly name spaced + default id + + * libebook/e-book.c: kill unneccesary define + 2003-11-04 JP Rosevear * libedatabook/e-data-book-factory.c: remove corbe header include diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c index 4ec6ca6..aea00dd 100644 --- a/addressbook/libebook/e-book.c +++ b/addressbook/libebook/e-book.c @@ -23,8 +23,6 @@ static GObjectClass *parent_class; -#define CARDSERVER_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory" - #define e_return_error_if_fail(expr,error_code) G_STMT_START{ \ if G_LIKELY(expr) { } else \ { \ @@ -1281,7 +1279,7 @@ e_book_response_generic (EBook *book, * Used to cancel an already running operation on @book. This * function makes a synchronous CORBA to the backend telling it to * cancel the operation. If the operation wasn't cancellable (either - * transiently or permanently) or had already comopleted on the wombat + * transiently or permanently) or had already comopleted on the server * side, this function will return E_BOOK_STATUS_COULD_NOT_CANCEL, and * the operation will continue uncancelled. If the operation could be * cancelled, this function will return E_BOOK_ERROR_OK, and the diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c index 5b479e0..42b8ef2 100644 --- a/addressbook/libedata-book/e-data-book-factory.c +++ b/addressbook/libedata-book/e-data-book-factory.c @@ -20,7 +20,7 @@ #include "e-data-book-marshal.h" #include "e-data-book-factory.h" -#define DEFAULT_E_DATA_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory" +#define DEFAULT_E_DATA_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_DataServer_BookFactory" static BonoboObjectClass *e_data_book_factory_parent_class; diff --git a/addressbook/libedatabook/e-data-book-factory.c b/addressbook/libedatabook/e-data-book-factory.c index 5b479e0..42b8ef2 100644 --- a/addressbook/libedatabook/e-data-book-factory.c +++ b/addressbook/libedatabook/e-data-book-factory.c @@ -20,7 +20,7 @@ #include "e-data-book-marshal.h" #include "e-data-book-factory.h" -#define DEFAULT_E_DATA_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory" +#define DEFAULT_E_DATA_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_DataServer_BookFactory" static BonoboObjectClass *e_data_book_factory_parent_class; diff --git a/calendar/ChangeLog b/calendar/ChangeLog index dc08ecc..93609d2 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2003-11-04 JP Rosevear + + * libedatacal/e-data-cal-factory.c: use properly name spaced + default id + 2003-11-04 JP Rosevear * libecal/libecal-1.0.pc.in (prefix): include priv dir stuff for diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c index 0defa78..31d8907 100644 --- a/calendar/libedata-cal/e-data-cal-factory.c +++ b/calendar/libedata-cal/e-data-cal-factory.c @@ -29,7 +29,7 @@ #include "e-data-cal-factory.h" #define PARENT_TYPE BONOBO_TYPE_OBJECT -#define DEFAULT_E_DATA_CAL_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_CalendarFactory" +#define DEFAULT_E_DATA_CAL_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_DataServer_CalFactory" static BonoboObjectClass *parent_class; diff --git a/calendar/libedatacal/e-data-cal-factory.c b/calendar/libedatacal/e-data-cal-factory.c index 0defa78..31d8907 100644 --- a/calendar/libedatacal/e-data-cal-factory.c +++ b/calendar/libedatacal/e-data-cal-factory.c @@ -29,7 +29,7 @@ #include "e-data-cal-factory.h" #define PARENT_TYPE BONOBO_TYPE_OBJECT -#define DEFAULT_E_DATA_CAL_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_CalendarFactory" +#define DEFAULT_E_DATA_CAL_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_DataServer_CalFactory" static BonoboObjectClass *parent_class; diff --git a/src/Evolution-DataServer.idl b/src/Evolution-DataServer.idl index e1759e4..2a5e887 100644 --- a/src/Evolution-DataServer.idl +++ b/src/Evolution-DataServer.idl @@ -8,12 +8,14 @@ module GNOME { module Evolution { - +module DataServer { + interface Config { }; - interface ServerInterfaceCheck : Bonobo::Unknown { + interface InterfaceCheck : Bonobo::Unknown { readonly attribute string interfaceVersion; }; }; }; +}; diff --git a/src/GNOME_Evolution_DataServerLDAP.server.in.in b/src/GNOME_Evolution_DataServerLDAP.server.in.in index e687598..953e412 100644 --- a/src/GNOME_Evolution_DataServerLDAP.server.in.in +++ b/src/GNOME_Evolution_DataServerLDAP.server.in.in @@ -1,6 +1,6 @@ - @@ -10,7 +10,7 @@ + _value="Evolution Addressbook file and LDAP backend"/> @@ -19,7 +19,7 @@ - @@ -29,7 +29,7 @@ + _value="Evolution Calendar file and webcal backend"/> @@ -37,7 +37,7 @@ - diff --git a/src/GNOME_Evolution_DataServerNOLDAP.server.in.in b/src/GNOME_Evolution_DataServerNOLDAP.server.in.in index 0b87663..8e5c495 100644 --- a/src/GNOME_Evolution_DataServerNOLDAP.server.in.in +++ b/src/GNOME_Evolution_DataServerNOLDAP.server.in.in @@ -1,6 +1,6 @@ - @@ -10,7 +10,7 @@ + _value="Evolution Addressbook file backend"/> @@ -18,7 +18,7 @@ - @@ -28,7 +28,7 @@ + _value="Evolution Calendar file and webcal backend"/> @@ -36,7 +36,7 @@ - diff --git a/src/server-interface-check.c b/src/server-interface-check.c index 570d1d4..ee72930 100644 --- a/src/server-interface-check.c +++ b/src/server-interface-check.c @@ -65,6 +65,6 @@ server_interface_check_new (void) BONOBO_TYPE_FUNC_FULL (ServerInterfaceCheck, - GNOME_Evolution_ServerInterfaceCheck, + GNOME_Evolution_DataServer_InterfaceCheck, PARENT_TYPE, server_interface_check) diff --git a/src/server-interface-check.h b/src/server-interface-check.h index f30b7a2..480bf4a 100644 --- a/src/server-interface-check.h +++ b/src/server-interface-check.h @@ -51,7 +51,7 @@ struct _ServerInterfaceCheck { struct _ServerInterfaceCheckClass { BonoboObjectClass parent_class; - POA_GNOME_Evolution_ServerInterfaceCheck__epv epv; + POA_GNOME_Evolution_DataServer_InterfaceCheck__epv epv; }; diff --git a/src/server.c b/src/server.c index ea10739..754e8b9 100644 --- a/src/server.c +++ b/src/server.c @@ -41,8 +41,10 @@ #include "server-interface-check.h" -#define E_DATA_CAL_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_CalendarFactory" -#define E_DATA_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory" +#define E_DATA_SERVER_INTERFACE_CHECK_OAF_ID "OAFIID:GNOME_Evolution_DataServer_InterfaceCheck" + +#define E_DATA_CAL_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_DataServer_CalFactory" +#define E_DATA_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_DataServer_BookFactory" /* The and addressbook calendar factories */ @@ -175,7 +177,7 @@ setup_interface_check (void) ServerInterfaceCheck *interface_check_iface = server_interface_check_new (); int result; - result = bonobo_activation_active_server_register ("OAFIID:GNOME_Evolution_Server_InterfaceCheck", + result = bonobo_activation_active_server_register (E_DATA_SERVER_INTERFACE_CHECK_OAF_ID, BONOBO_OBJREF (interface_check_iface)); return result == Bonobo_ACTIVATION_REG_SUCCESS; -- 2.7.4