aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend/pas
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/backend/pas')
-rw-r--r--addressbook/backend/pas/Makefile.am2
-rw-r--r--addressbook/backend/pas/pas-backend-file.c54
-rw-r--r--addressbook/backend/pas/pas-backend-ldap.c36
-rw-r--r--addressbook/backend/pas/pas-backend.c2
-rw-r--r--addressbook/backend/pas/pas-backend.h6
-rw-r--r--addressbook/backend/pas/pas-book-factory.c44
-rw-r--r--addressbook/backend/pas/pas-book-view.c46
-rw-r--r--addressbook/backend/pas/pas-book-view.h4
-rw-r--r--addressbook/backend/pas/pas-book.c124
-rw-r--r--addressbook/backend/pas/pas-book.h22
-rw-r--r--addressbook/backend/pas/pas-card-cursor.c28
-rw-r--r--addressbook/backend/pas/pas-card-cursor.h4
12 files changed, 186 insertions, 186 deletions
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index 819f99e57d..4bd2888c10 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -10,7 +10,7 @@ idls = \
idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
$(CORBA_SOURCE): $(idls)
- $(ORBIT_IDL) $(srcdir)/../idl/addressbook.idl $(idl_flags)
+ $(ORBIT_IDL) -I $(srcdir) $(srcdir)/../idl/addressbook.idl $(idl_flags)
INCLUDES = \
-DGNOMELOCALEDIR=\""$(localedir)"\" \
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index ce4ada1bc2..ee82c94b2d 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -143,14 +143,14 @@ static void
cursor_destroy(GtkObject *object, gpointer data)
{
CORBA_Environment ev;
- Evolution_Book corba_book;
+ GNOME_Evolution_Addressbook_Book corba_book;
PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;
corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
CORBA_exception_init(&ev);
- Evolution_Book_unref(corba_book, &ev);
+ GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("cursor_destroy: Exception unreffing "
@@ -169,7 +169,7 @@ static void
view_destroy(GtkObject *object, gpointer data)
{
CORBA_Environment ev;
- Evolution_Book corba_book;
+ GNOME_Evolution_Addressbook_Book corba_book;
PASBook *book = (PASBook *)data;
PASBackendFile *bf;
EIterator *iterator;
@@ -188,7 +188,7 @@ view_destroy(GtkObject *object, gpointer data)
CORBA_exception_init(&ev);
- Evolution_Book_unref(corba_book, &ev);
+ GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("view_destroy: Exception unreffing "
@@ -713,7 +713,7 @@ pas_backend_file_process_create_card (PASBackend *backend,
pas_book_respond_create (
book,
- Evolution_BookListener_Success,
+ GNOME_Evolution_Addressbook_BookListener_Success,
id);
g_free(vcard);
g_free(id);
@@ -723,7 +723,7 @@ pas_backend_file_process_create_card (PASBackend *backend,
think */
pas_book_respond_create (
book,
- Evolution_BookListener_CardNotFound,
+ GNOME_Evolution_Addressbook_BookListener_CardNotFound,
"");
}
@@ -748,7 +748,7 @@ pas_backend_file_process_remove_card (PASBackend *backend,
if (0 != db_error) {
pas_book_respond_remove (
book,
- Evolution_BookListener_CardNotFound);
+ GNOME_Evolution_Addressbook_BookListener_CardNotFound);
g_free (req->id);
return;
}
@@ -757,7 +757,7 @@ pas_backend_file_process_remove_card (PASBackend *backend,
if (0 != db_error) {
pas_book_respond_remove (
book,
- Evolution_BookListener_CardNotFound);
+ GNOME_Evolution_Addressbook_BookListener_CardNotFound);
g_free (req->id);
return;
}
@@ -779,7 +779,7 @@ pas_backend_file_process_remove_card (PASBackend *backend,
pas_book_respond_remove (
book,
- Evolution_BookListener_Success);
+ GNOME_Evolution_Addressbook_BookListener_Success);
g_free (req->id);
}
@@ -809,7 +809,7 @@ pas_backend_file_process_modify_card (PASBackend *backend,
if (0 != db_error) {
pas_book_respond_modify (
book,
- Evolution_BookListener_CardNotFound);
+ GNOME_Evolution_Addressbook_BookListener_CardNotFound);
g_free (req->id);
return;
}
@@ -849,12 +849,12 @@ pas_backend_file_process_modify_card (PASBackend *backend,
pas_book_respond_modify (
book,
- Evolution_BookListener_Success);
+ GNOME_Evolution_Addressbook_BookListener_Success);
}
else {
pas_book_respond_modify (
book,
- Evolution_BookListener_CardNotFound);
+ GNOME_Evolution_Addressbook_BookListener_CardNotFound);
}
g_free(old_vcard_string);
@@ -913,7 +913,7 @@ pas_backend_file_process_get_cursor (PASBackend *backend,
int db_error = 0;
PASBackendFileCursorPrivate *cursor_data;
PASCardCursor *cursor;
- Evolution_Book corba_book;
+ GNOME_Evolution_Addressbook_Book corba_book;
cursor_data = g_new(PASBackendFileCursorPrivate, 1);
cursor_data->backend = backend;
@@ -925,7 +925,7 @@ pas_backend_file_process_get_cursor (PASBackend *backend,
CORBA_exception_init(&ev);
- Evolution_Book_ref(corba_book, &ev);
+ GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("pas_backend_file_process_get_cursor: Exception reffing "
@@ -944,8 +944,8 @@ pas_backend_file_process_get_cursor (PASBackend *backend,
pas_book_respond_get_cursor (
book,
(db_error == 0
- ? Evolution_BookListener_Success
- : Evolution_BookListener_CardNotFound),
+ ? GNOME_Evolution_Addressbook_BookListener_Success
+ : GNOME_Evolution_Addressbook_BookListener_CardNotFound),
cursor);
}
@@ -957,7 +957,7 @@ pas_backend_file_process_get_book_view (PASBackend *backend,
PASBackendFile *bf = PAS_BACKEND_FILE (backend);
CORBA_Environment ev;
PASBookView *book_view;
- Evolution_Book corba_book;
+ GNOME_Evolution_Addressbook_Book corba_book;
PASBackendFileBookView view;
PASBackendFileSearchContext ctx;
EIterator *iterator;
@@ -968,7 +968,7 @@ pas_backend_file_process_get_book_view (PASBackend *backend,
CORBA_exception_init(&ev);
- Evolution_Book_ref(corba_book, &ev);
+ GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("pas_backend_file_process_get_book_view: Exception reffing "
@@ -984,8 +984,8 @@ pas_backend_file_process_get_book_view (PASBackend *backend,
pas_book_respond_get_book_view (book,
(book_view != NULL
- ? Evolution_BookListener_Success
- : Evolution_BookListener_CardNotFound /* XXX */),
+ ? GNOME_Evolution_Addressbook_BookListener_Success
+ : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
book_view);
view.book_view = book_view;
@@ -1012,7 +1012,7 @@ pas_backend_file_process_get_changes (PASBackend *backend,
PASBackendFile *bf = PAS_BACKEND_FILE (backend);
CORBA_Environment ev;
PASBookView *book_view;
- Evolution_Book corba_book;
+ GNOME_Evolution_Addressbook_Book corba_book;
PASBackendFileBookView view;
PASBackendFileChangeContext ctx;
EIterator *iterator;
@@ -1023,7 +1023,7 @@ pas_backend_file_process_get_changes (PASBackend *backend,
CORBA_exception_init(&ev);
- Evolution_Book_ref(corba_book, &ev);
+ GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("pas_backend_file_process_get_book_view: Exception reffing "
@@ -1039,8 +1039,8 @@ pas_backend_file_process_get_changes (PASBackend *backend,
pas_book_respond_get_changes (book,
(book_view != NULL
- ? Evolution_BookListener_Success
- : Evolution_BookListener_CardNotFound /* XXX */),
+ ? GNOME_Evolution_Addressbook_BookListener_Success
+ : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
book_view);
view.book_view = book_view;
@@ -1317,7 +1317,7 @@ pas_backend_file_get_uri (PASBackend *backend)
static gboolean
pas_backend_file_add_client (PASBackend *backend,
- Evolution_BookListener listener)
+ GNOME_Evolution_Addressbook_BookListener listener)
{
PASBackendFile *bf;
PASBook *book;
@@ -1351,11 +1351,11 @@ pas_backend_file_add_client (PASBackend *backend,
if (bf->priv->loaded) {
pas_book_respond_open (
- book, Evolution_BookListener_Success);
+ book, GNOME_Evolution_Addressbook_BookListener_Success);
} else {
/* Open the book. */
pas_book_respond_open (
- book, Evolution_BookListener_Success);
+ book, GNOME_Evolution_Addressbook_BookListener_Success);
}
return TRUE;
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 46010dc4a7..22e37b3841 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -143,7 +143,7 @@ static void
view_destroy(GtkObject *object, gpointer data)
{
CORBA_Environment ev;
- Evolution_Book corba_book;
+ GNOME_Evolution_Addressbook_Book corba_book;
PASBook *book = (PASBook *)data;
PASBackendLDAP *bl;
GList *list;
@@ -185,7 +185,7 @@ view_destroy(GtkObject *object, gpointer data)
CORBA_exception_init(&ev);
- Evolution_Book_unref(corba_book, &ev);
+ GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("view_destroy: Exception unreffing "
@@ -329,15 +329,15 @@ static int
ldap_error_to_response (int ldap_error)
{
if (ldap_error == LDAP_SUCCESS)
- return Evolution_BookListener_Success;
+ return GNOME_Evolution_Addressbook_BookListener_Success;
else if (NAME_ERROR (ldap_error))
- return Evolution_BookListener_CardNotFound;
+ return GNOME_Evolution_Addressbook_BookListener_CardNotFound;
else if (ldap_error == LDAP_INSUFFICIENT_ACCESS)
- return Evolution_BookListener_PermissionDenied;
+ return GNOME_Evolution_Addressbook_BookListener_PermissionDenied;
else if (ldap_error == LDAP_SERVER_DOWN)
- return Evolution_BookListener_RepositoryOffline;
+ return GNOME_Evolution_Addressbook_BookListener_RepositoryOffline;
else
- return Evolution_BookListener_OtherError;
+ return GNOME_Evolution_Addressbook_BookListener_OtherError;
}
@@ -757,14 +757,14 @@ static void
cursor_destroy(GtkObject *object, gpointer data)
{
CORBA_Environment ev;
- Evolution_Book corba_book;
+ GNOME_Evolution_Addressbook_Book corba_book;
PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
CORBA_exception_init(&ev);
- Evolution_Book_unref(corba_book, &ev);
+ GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("cursor_destroy: Exception unreffing "
@@ -831,7 +831,7 @@ get_cursor_handler (PASBackend *backend, LDAPOp *op)
CORBA_Environment ev;
int ldap_error = 0;
PASCardCursor *cursor;
- Evolution_Book corba_book;
+ GNOME_Evolution_Addressbook_Book corba_book;
PASBackendLDAPCursorPrivate *cursor_data;
PASBook *book = cursor_op->book;
@@ -845,7 +845,7 @@ get_cursor_handler (PASBackend *backend, LDAPOp *op)
CORBA_exception_init(&ev);
- Evolution_Book_ref(corba_book, &ev);
+ GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("pas_backend_file_process_get_cursor: Exception reffing "
@@ -1467,7 +1467,7 @@ pas_backend_ldap_process_get_book_view (PASBackend *backend,
{
PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
CORBA_Environment ev;
- Evolution_Book corba_book;
+ GNOME_Evolution_Addressbook_Book corba_book;
PASBookView *book_view;
PASBackendLDAPBookView *view;
@@ -1477,7 +1477,7 @@ pas_backend_ldap_process_get_book_view (PASBackend *backend,
CORBA_exception_init(&ev);
- Evolution_Book_ref(corba_book, &ev);
+ GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("pas_backend_file_process_get_book_view: Exception reffing "
@@ -1493,8 +1493,8 @@ pas_backend_ldap_process_get_book_view (PASBackend *backend,
pas_book_respond_get_book_view (book,
(book_view != NULL
- ? Evolution_BookListener_Success
- : Evolution_BookListener_CardNotFound /* XXX */),
+ ? GNOME_Evolution_Addressbook_BookListener_Success
+ : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
book_view);
view = g_new0(PASBackendLDAPBookView, 1);
@@ -1650,7 +1650,7 @@ pas_backend_ldap_get_uri (PASBackend *backend)
static gboolean
pas_backend_ldap_add_client (PASBackend *backend,
- Evolution_BookListener listener)
+ GNOME_Evolution_Addressbook_BookListener listener)
{
PASBackendLDAP *bl;
PASBook *book;
@@ -1684,11 +1684,11 @@ pas_backend_ldap_add_client (PASBackend *backend,
if (bl->priv->connected) {
pas_book_respond_open (
- book, Evolution_BookListener_Success);
+ book, GNOME_Evolution_Addressbook_BookListener_Success);
} else {
/* Open the book. */
pas_book_respond_open (
- book, Evolution_BookListener_Success);
+ book, GNOME_Evolution_Addressbook_BookListener_Success);
}
return TRUE;
diff --git a/addressbook/backend/pas/pas-backend.c b/addressbook/backend/pas/pas-backend.c
index 1568918560..22b7184813 100644
--- a/addressbook/backend/pas/pas-backend.c
+++ b/addressbook/backend/pas/pas-backend.c
@@ -71,7 +71,7 @@ pas_backend_get_uri (PASBackend *backend)
*/
gboolean
pas_backend_add_client (PASBackend *backend,
- Evolution_BookListener listener)
+ GNOME_Evolution_Addressbook_BookListener listener)
{
g_return_val_if_fail (backend != NULL, FALSE);
g_return_val_if_fail (PAS_IS_BACKEND (backend), FALSE);
diff --git a/addressbook/backend/pas/pas-backend.h b/addressbook/backend/pas/pas-backend.h
index 4045074284..be08d48950 100644
--- a/addressbook/backend/pas/pas-backend.h
+++ b/addressbook/backend/pas/pas-backend.h
@@ -11,7 +11,7 @@
* add a new client to an existing PASBackend server.
*
* 2. A PASBook, when a client has requested an operation on the
- * Evolution_Book interface.
+ * GNOME_Evolution_Addressbook_Book interface.
*
* Author:
* Nat Friedman (nat@helixcode.com)
@@ -42,7 +42,7 @@ typedef struct {
/* Virtual methods */
gboolean (*load_uri) (PASBackend *backend, const char *uri);
const char *(* get_uri) (PASBackend *backend);
- gboolean (*add_client) (PASBackend *backend, Evolution_BookListener listener);
+ gboolean (*add_client) (PASBackend *backend, GNOME_Evolution_Addressbook_BookListener listener);
void (*remove_client) (PASBackend *backend, PASBook *book);
char *(*get_static_capabilities) (PASBackend *backend);
@@ -58,7 +58,7 @@ gboolean pas_backend_load_uri (PASBackend *backen
const char *pas_backend_get_uri (PASBackend *backend);
gboolean pas_backend_add_client (PASBackend *backend,
- Evolution_BookListener listener);
+ GNOME_Evolution_Addressbook_BookListener listener);
void pas_backend_remove_client (PASBackend *backend,
PASBook *book);
char *pas_backend_get_static_capabilities (PASBackend *backend);
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
index 02dedbabe5..c81513de0f 100644
--- a/addressbook/backend/pas/pas-book-factory.c
+++ b/addressbook/backend/pas/pas-book-factory.c
@@ -18,11 +18,11 @@
#define PAS_BOOK_FACTORY_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
static BonoboObjectClass *pas_book_factory_parent_class;
-POA_Evolution_BookFactory__vepv pas_book_factory_vepv;
+POA_GNOME_Evolution_Addressbook_BookFactory__vepv pas_book_factory_vepv;
typedef struct {
char *uri;
- Evolution_BookListener listener;
+ GNOME_Evolution_Addressbook_BookListener listener;
} PASBookFactoryQueuedRequest;
struct _PASBookFactoryPrivate {
@@ -174,7 +174,7 @@ pas_book_factory_lookup_backend_factory (PASBookFactory *factory,
static PASBackend *
pas_book_factory_launch_backend (PASBookFactory *factory,
- Evolution_BookListener listener,
+ GNOME_Evolution_Addressbook_BookListener listener,
const char *uri)
{
PASBackendFactoryFn backend_factory;
@@ -187,9 +187,9 @@ pas_book_factory_launch_backend (PASBookFactory *factory,
CORBA_Environment ev;
CORBA_exception_init (&ev);
- Evolution_BookListener_respond_open_book (
+ GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
listener,
- Evolution_BookListener_ProtocolNotSupported,
+ GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported,
CORBA_OBJECT_NIL,
&ev);
@@ -206,9 +206,9 @@ pas_book_factory_launch_backend (PASBookFactory *factory,
CORBA_Environment ev;
CORBA_exception_init (&ev);
- Evolution_BookListener_respond_open_book (
+ GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
listener,
- Evolution_BookListener_OtherError,
+ GNOME_Evolution_Addressbook_BookListener_OtherError,
CORBA_OBJECT_NIL,
&ev);
@@ -237,7 +237,7 @@ pas_book_factory_process_request (PASBookFactory *factory,
{
PASBackend *backend;
char *uri;
- Evolution_BookListener listener;
+ GNOME_Evolution_Addressbook_BookListener listener;
CORBA_Environment ev;
uri = request->uri;
@@ -305,10 +305,10 @@ pas_book_factory_process_queue (PASBookFactory *factory)
static void
pas_book_factory_queue_request (PASBookFactory *factory,
const char *uri,
- const Evolution_BookListener listener)
+ const GNOME_Evolution_Addressbook_BookListener listener)
{
PASBookFactoryQueuedRequest *request;
- Evolution_BookListener listener_copy;
+ GNOME_Evolution_Addressbook_BookListener listener_copy;
CORBA_Environment ev;
CORBA_exception_init (&ev);
@@ -338,9 +338,9 @@ pas_book_factory_queue_request (PASBookFactory *factory,
static void
-impl_Evolution_BookFactory_open_book (PortableServer_Servant servant,
+impl_GNOME_Evolution_Addressbook_BookFactory_openBook (PortableServer_Servant servant,
const CORBA_char *uri,
- const Evolution_BookListener listener,
+ const GNOME_Evolution_Addressbook_BookListener listener,
CORBA_Environment *ev)
{
PASBookFactory *factory =
@@ -350,9 +350,9 @@ impl_Evolution_BookFactory_open_book (PortableServer_Servant servant,
backend_factory = pas_book_factory_lookup_backend_factory (factory, uri);
if (backend_factory == NULL) {
- Evolution_BookListener_respond_open_book (
+ GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
listener,
- Evolution_BookListener_ProtocolNotSupported,
+ GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported,
CORBA_OBJECT_NIL,
ev);
@@ -365,19 +365,19 @@ impl_Evolution_BookFactory_open_book (PortableServer_Servant servant,
static gboolean
pas_book_factory_construct (PASBookFactory *factory)
{
- POA_Evolution_BookFactory *servant;
+ POA_GNOME_Evolution_Addressbook_BookFactory *servant;
CORBA_Environment ev;
CORBA_Object obj;
g_assert (factory != NULL);
g_assert (PAS_IS_BOOK_FACTORY (factory));
- servant = (POA_Evolution_BookFactory *) g_new0 (BonoboObjectServant, 1);
+ servant = (POA_GNOME_Evolution_Addressbook_BookFactory *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &pas_book_factory_vepv;
CORBA_exception_init (&ev);
- POA_Evolution_BookFactory__init ((PortableServer_Servant) servant, &ev);
+ POA_GNOME_Evolution_Addressbook_BookFactory__init ((PortableServer_Servant) servant, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_free (servant);
CORBA_exception_free (&ev);
@@ -526,14 +526,14 @@ pas_book_factory_destroy (GtkObject *object)
GTK_OBJECT_CLASS (pas_book_factory_parent_class)->destroy (object);
}
-static POA_Evolution_BookFactory__epv *
+static POA_GNOME_Evolution_Addressbook_BookFactory__epv *
pas_book_factory_get_epv (void)
{
- POA_Evolution_BookFactory__epv *epv;
+ POA_GNOME_Evolution_Addressbook_BookFactory__epv *epv;
- epv = g_new0 (POA_Evolution_BookFactory__epv, 1);
+ epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookFactory__epv, 1);
- epv->open_book = impl_Evolution_BookFactory_open_book;
+ epv->openBook = impl_GNOME_Evolution_Addressbook_BookFactory_openBook;
return epv;
@@ -543,7 +543,7 @@ static void
pas_book_factory_corba_class_init (void)
{
pas_book_factory_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
- pas_book_factory_vepv.Evolution_BookFactory_epv = pas_book_factory_get_epv ();
+ pas_book_factory_vepv.GNOME_Evolution_Addressbook_BookFactory_epv = pas_book_factory_get_epv ();
}
static void
diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c
index 94babf6280..12e46533a4 100644
--- a/addressbook/backend/pas/pas-book-view.c
+++ b/addressbook/backend/pas/pas-book-view.c
@@ -10,10 +10,10 @@
#include "pas-book-view.h"
static BonoboObjectClass *pas_book_view_parent_class;
-POA_Evolution_BookView__vepv pas_book_view_vepv;
+POA_GNOME_Evolution_Addressbook_BookView__vepv pas_book_view_vepv;
struct _PASBookViewPrivate {
- Evolution_BookViewListener listener;
+ GNOME_Evolution_Addressbook_BookViewListener listener;
};
/**
@@ -25,11 +25,11 @@ pas_book_view_notify_change (PASBookView *book_view,
{
CORBA_Environment ev;
gint i, length;
- CORBA_sequence_Evolution_VCard card_sequence;
+ CORBA_sequence_GNOME_Evolution_Addressbook_VCard card_sequence;
length = g_list_length((GList *) cards);
- card_sequence._buffer = CORBA_sequence_Evolution_VCard_allocbuf(length);
+ card_sequence._buffer = CORBA_sequence_GNOME_Evolution_Addressbook_VCard_allocbuf(length);
card_sequence._maximum = length;
card_sequence._length = length;
@@ -39,7 +39,7 @@ pas_book_view_notify_change (PASBookView *book_view,
CORBA_exception_init (&ev);
- Evolution_BookViewListener_signal_card_changed (
+ GNOME_Evolution_Addressbook_BookViewListener_notifyCardChanged (
book_view->priv->listener, &card_sequence, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -71,8 +71,8 @@ pas_book_view_notify_remove (PASBookView *book_view,
CORBA_exception_init (&ev);
- Evolution_BookViewListener_signal_card_removed (
- book_view->priv->listener, (Evolution_CardId) id, &ev);
+ GNOME_Evolution_Addressbook_BookViewListener_notifyCardRemoved (
+ book_view->priv->listener, (GNOME_Evolution_Addressbook_CardId) id, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("pas_book_view_notify_remove: Exception signaling BookViewListener!\n");
@@ -90,11 +90,11 @@ pas_book_view_notify_add (PASBookView *book_view,
{
CORBA_Environment ev;
gint i, length;
- CORBA_sequence_Evolution_VCard card_sequence;
+ CORBA_sequence_GNOME_Evolution_Addressbook_VCard card_sequence;
length = g_list_length((GList *)cards);
- card_sequence._buffer = CORBA_sequence_Evolution_VCard_allocbuf(length);
+ card_sequence._buffer = CORBA_sequence_GNOME_Evolution_Addressbook_VCard_allocbuf(length);
card_sequence._maximum = length;
card_sequence._length = length;
@@ -104,7 +104,7 @@ pas_book_view_notify_add (PASBookView *book_view,
CORBA_exception_init (&ev);
- Evolution_BookViewListener_signal_card_added (
+ GNOME_Evolution_Addressbook_BookViewListener_notifyCardAdded (
book_view->priv->listener, &card_sequence, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -132,7 +132,7 @@ pas_book_view_notify_complete (PASBookView *book_view)
CORBA_exception_init (&ev);
- Evolution_BookViewListener_signal_sequence_complete (
+ GNOME_Evolution_Addressbook_BookViewListener_notifySequenceComplete (
book_view->priv->listener, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -150,7 +150,7 @@ pas_book_view_notify_status_message (PASBookView *book_view,
CORBA_exception_init (&ev);
- Evolution_BookViewListener_signal_status_message (
+ GNOME_Evolution_Addressbook_BookViewListener_notifyStatusMessage (
book_view->priv->listener, message, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -162,9 +162,9 @@ pas_book_view_notify_status_message (PASBookView *book_view,
static gboolean
pas_book_view_construct (PASBookView *book_view,
- Evolution_BookViewListener listener)
+ GNOME_Evolution_Addressbook_BookViewListener listener)
{
- POA_Evolution_BookView *servant;
+ POA_GNOME_Evolution_Addressbook_BookView *servant;
CORBA_Environment ev;
CORBA_Object obj;
@@ -172,12 +172,12 @@ pas_book_view_construct (PASBookView *book_view,
g_assert (PAS_IS_BOOK_VIEW (book_view));
g_assert (listener != CORBA_OBJECT_NIL);
- servant = (POA_Evolution_BookView *) g_new0 (BonoboObjectServant, 1);
+ servant = (POA_GNOME_Evolution_Addressbook_BookView *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &pas_book_view_vepv;
CORBA_exception_init (&ev);
- POA_Evolution_BookView__init ((PortableServer_Servant) servant, &ev);
+ POA_GNOME_Evolution_Addressbook_BookView__init ((PortableServer_Servant) servant, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_free (servant);
CORBA_exception_free (&ev);
@@ -193,7 +193,7 @@ pas_book_view_construct (PASBookView *book_view,
return FALSE;
}
- Evolution_BookViewListener_ref (listener, &ev);
+ GNOME_Evolution_Addressbook_BookViewListener_ref (listener, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("Unable to ref listener object in pas-book-view.c\n");
CORBA_exception_free (&ev);
@@ -221,7 +221,7 @@ pas_book_view_construct (PASBookView *book_view,
* pas_book_view_new:
*/
PASBookView *
-pas_book_view_new (Evolution_BookViewListener listener)
+pas_book_view_new (GNOME_Evolution_Addressbook_BookViewListener listener)
{
PASBookView *book_view;
@@ -246,7 +246,7 @@ pas_book_view_destroy (GtkObject *object)
CORBA_exception_init (&ev);
- Evolution_BookViewListener_unref (book_view->priv->listener, &ev);
+ GNOME_Evolution_Addressbook_BookViewListener_unref (book_view->priv->listener, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("Unable to unref listener object in pas-book-view.c\n");
CORBA_exception_free (&ev);
@@ -269,12 +269,12 @@ pas_book_view_destroy (GtkObject *object)
GTK_OBJECT_CLASS (pas_book_view_parent_class)->destroy (object);
}
-static POA_Evolution_BookView__epv *
+static POA_GNOME_Evolution_Addressbook_BookView__epv *
pas_book_view_get_epv (void)
{
- POA_Evolution_BookView__epv *epv;
+ POA_GNOME_Evolution_Addressbook_BookView__epv *epv;
- epv = g_new0 (POA_Evolution_BookView__epv, 1);
+ epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookView__epv, 1);
return epv;
@@ -284,7 +284,7 @@ static void
pas_book_view_corba_class_init (void)
{
pas_book_view_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
- pas_book_view_vepv.Evolution_BookView_epv = pas_book_view_get_epv ();
+ pas_book_view_vepv.GNOME_Evolution_Addressbook_BookView_epv = pas_book_view_get_epv ();
}
static void
diff --git a/addressbook/backend/pas/pas-book-view.h b/addressbook/backend/pas/pas-book-view.h
index df6aed5bbb..fb9e892dfd 100644
--- a/addressbook/backend/pas/pas-book-view.h
+++ b/addressbook/backend/pas/pas-book-view.h
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * A wrapper object which exports the Evolution_Book CORBA interface
+ * A wrapper object which exports the GNOME_Evolution_Addressbook_Book CORBA interface
* and which maintains a request queue.
*
* Author:
@@ -28,7 +28,7 @@ struct _PASBookView {
struct _PASBookViewClass {
BonoboObjectClass parent_class;
};
-PASBookView *pas_book_view_new (Evolution_BookViewListener listener);
+PASBookView *pas_book_view_new (GNOME_Evolution_Addressbook_BookViewListener listener);
void pas_book_view_notify_change (PASBookView *book_view,
const GList *cards);
diff --git a/addressbook/backend/pas/pas-book.c b/addressbook/backend/pas/pas-book.c
index b1d2688b3f..6fded8301d 100644
--- a/addressbook/backend/pas/pas-book.c
+++ b/addressbook/backend/pas/pas-book.c
@@ -10,7 +10,7 @@
#include "pas-book.h"
static BonoboObjectClass *pas_book_parent_class;
-POA_Evolution_Book__vepv pas_book_vepv;
+POA_GNOME_Evolution_Addressbook_Book__vepv pas_book_vepv;
enum {
REQUESTS_QUEUED,
@@ -21,7 +21,7 @@ static guint pas_book_signals [LAST_SIGNAL];
struct _PASBookPrivate {
PASBackend *backend;
- Evolution_BookListener listener;
+ GNOME_Evolution_Addressbook_BookListener listener;
PASBookGetVCardFn get_vcard;
PASBookCanWriteFn can_write;
PASBookCanWriteCardFn can_write_card;
@@ -106,7 +106,7 @@ pas_book_queue_get_cursor (PASBook *book, const char *search)
}
static void
-pas_book_queue_get_book_view (PASBook *book, const Evolution_BookViewListener listener, const char *search)
+pas_book_queue_get_book_view (PASBook *book, const GNOME_Evolution_Addressbook_BookViewListener listener, const char *search)
{
PASRequest *req;
CORBA_Environment ev;
@@ -130,7 +130,7 @@ pas_book_queue_get_book_view (PASBook *book, const Evolution_BookViewListener li
}
static void
-pas_book_queue_get_changes (PASBook *book, const Evolution_BookViewListener listener, const char *change_id)
+pas_book_queue_get_changes (PASBook *book, const GNOME_Evolution_Addressbook_BookViewListener listener, const char *change_id)
{
PASRequest *req;
CORBA_Environment ev;
@@ -165,9 +165,9 @@ pas_book_queue_check_connection (PASBook *book)
}
static CORBA_char *
-impl_Evolution_Book_get_vcard (PortableServer_Servant servant,
- const Evolution_CardId id,
- CORBA_Environment *ev)
+impl_GNOME_Evolution_Addressbook_Book_getVCard (PortableServer_Servant servant,
+ const GNOME_Evolution_Addressbook_CardId id,
+ CORBA_Environment *ev)
{
PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
char *vcard;
@@ -181,7 +181,7 @@ impl_Evolution_Book_get_vcard (PortableServer_Servant servant,
}
static CORBA_boolean
-impl_Evolution_Book_can_write (PortableServer_Servant servant,
+impl_GNOME_Evolution_Addressbook_Book_isWriteable (PortableServer_Servant servant,
CORBA_Environment *ev)
{
PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
@@ -193,9 +193,9 @@ impl_Evolution_Book_can_write (PortableServer_Servant servant,
}
static CORBA_boolean
-impl_Evolution_Book_can_write_card (PortableServer_Servant servant,
- const Evolution_CardId id,
- CORBA_Environment *ev)
+impl_GNOME_Evolution_Addressbook_Book_isCardWriteable (PortableServer_Servant servant,
+ const GNOME_Evolution_Addressbook_CardId id,
+ CORBA_Environment *ev)
{
PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
CORBA_boolean retval;
@@ -206,8 +206,8 @@ impl_Evolution_Book_can_write_card (PortableServer_Servant servant,
}
static void
-impl_Evolution_Book_create_card (PortableServer_Servant servant,
- const Evolution_VCard vcard,
+impl_GNOME_Evolution_Addressbook_Book_addCard (PortableServer_Servant servant,
+ const GNOME_Evolution_Addressbook_VCard vcard,
CORBA_Environment *ev)
{
PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
@@ -216,8 +216,8 @@ impl_Evolution_Book_create_card (PortableServer_Servant servant,
}
static void
-impl_Evolution_Book_remove_card (PortableServer_Servant servant,
- const Evolution_CardId id,
+impl_GNOME_Evolution_Addressbook_Book_removeCard (PortableServer_Servant servant,
+ const GNOME_Evolution_Addressbook_CardId id,
CORBA_Environment *ev)
{
PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
@@ -226,8 +226,8 @@ impl_Evolution_Book_remove_card (PortableServer_Servant servant,
}
static void
-impl_Evolution_Book_modify_card (PortableServer_Servant servant,
- const Evolution_VCard vcard,
+impl_GNOME_Evolution_Addressbook_Book_modifyCard (PortableServer_Servant servant,
+ const GNOME_Evolution_Addressbook_VCard vcard,
CORBA_Environment *ev)
{
PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
@@ -236,7 +236,7 @@ impl_Evolution_Book_modify_card (PortableServer_Servant servant,
}
static void
-impl_Evolution_Book_get_cursor (PortableServer_Servant servant,
+impl_GNOME_Evolution_Addressbook_Book_getCursor (PortableServer_Servant servant,
const CORBA_char *search,
CORBA_Environment *ev)
{
@@ -246,8 +246,8 @@ impl_Evolution_Book_get_cursor (PortableServer_Servant servant,
}
static void
-impl_Evolution_Book_get_book_view (PortableServer_Servant servant,
- const Evolution_BookViewListener listener,
+impl_GNOME_Evolution_Addressbook_Book_getBookView (PortableServer_Servant servant,
+ const GNOME_Evolution_Addressbook_BookViewListener listener,
const CORBA_char *search,
CORBA_Environment *ev)
{
@@ -257,8 +257,8 @@ impl_Evolution_Book_get_book_view (PortableServer_Servant servant,
}
static void
-impl_Evolution_Book_get_changes (PortableServer_Servant servant,
- const Evolution_BookViewListener listener,
+impl_GNOME_Evolution_Addressbook_Book_getChanges (PortableServer_Servant servant,
+ const GNOME_Evolution_Addressbook_BookViewListener listener,
const CORBA_char *change_id,
CORBA_Environment *ev)
{
@@ -268,7 +268,7 @@ impl_Evolution_Book_get_changes (PortableServer_Servant servant,
}
static void
-impl_Evolution_Book_check_connection (PortableServer_Servant servant,
+impl_GNOME_Evolution_Addressbook_Book_checkConnection (PortableServer_Servant servant,
CORBA_Environment *ev)
{
PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
@@ -277,7 +277,7 @@ impl_Evolution_Book_check_connection (PortableServer_Servant servant,
}
static char *
-impl_Evolution_Book_get_static_capabilities (PortableServer_Servant servant,
+impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities (PortableServer_Servant servant,
CORBA_Environment *ev)
{
PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
@@ -305,7 +305,7 @@ pas_book_get_backend (PASBook *book)
/**
* pas_book_get_listener:
*/
-Evolution_BookListener
+GNOME_Evolution_Addressbook_BookListener
pas_book_get_listener (PASBook *book)
{
g_return_val_if_fail (book != NULL, CORBA_OBJECT_NIL);
@@ -357,19 +357,19 @@ pas_book_pop_request (PASBook *book)
*/
void
pas_book_respond_open (PASBook *book,
- Evolution_BookListener_CallStatus status)
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status)
{
CORBA_Environment ev;
CORBA_exception_init (&ev);
- if (status == Evolution_BookListener_Success) {
- Evolution_BookListener_respond_open_book (
+ if (status == GNOME_Evolution_Addressbook_BookListener_Success) {
+ GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
book->priv->listener, status,
bonobo_object_corba_objref (BONOBO_OBJECT (book)),
&ev);
} else {
- Evolution_BookListener_respond_open_book (
+ GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
book->priv->listener, status,
CORBA_OBJECT_NIL, &ev);
}
@@ -388,14 +388,14 @@ pas_book_respond_open (PASBook *book,
*/
void
pas_book_respond_create (PASBook *book,
- Evolution_BookListener_CallStatus status,
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status,
const char *id)
{
CORBA_Environment ev;
CORBA_exception_init (&ev);
- Evolution_BookListener_respond_create_card (
+ GNOME_Evolution_Addressbook_BookListener_notifyCardCreated (
book->priv->listener, status, (char *)id, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -411,13 +411,13 @@ pas_book_respond_create (PASBook *book,
*/
void
pas_book_respond_remove (PASBook *book,
- Evolution_BookListener_CallStatus status)
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status)
{
CORBA_Environment ev;
CORBA_exception_init (&ev);
- Evolution_BookListener_respond_remove_card (
+ GNOME_Evolution_Addressbook_BookListener_notifyCardRemoved (
book->priv->listener, status, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -433,13 +433,13 @@ pas_book_respond_remove (PASBook *book,
*/
void
pas_book_respond_modify (PASBook *book,
- Evolution_BookListener_CallStatus status)
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status)
{
CORBA_Environment ev;
CORBA_exception_init (&ev);
- Evolution_BookListener_respond_modify_card (
+ GNOME_Evolution_Addressbook_BookListener_notifyCardModified (
book->priv->listener, status, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -455,7 +455,7 @@ pas_book_respond_modify (PASBook *book,
*/
void
pas_book_respond_get_cursor (PASBook *book,
- Evolution_BookListener_CallStatus status,
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status,
PASCardCursor *cursor)
{
CORBA_Environment ev;
@@ -465,7 +465,7 @@ pas_book_respond_get_cursor (PASBook *book,
object = bonobo_object_corba_objref(BONOBO_OBJECT(cursor));
- Evolution_BookListener_respond_get_cursor (
+ GNOME_Evolution_Addressbook_BookListener_notifyCursorRequested (
book->priv->listener, status, object, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -481,7 +481,7 @@ pas_book_respond_get_cursor (PASBook *book,
*/
void
pas_book_respond_get_book_view (PASBook *book,
- Evolution_BookListener_CallStatus status,
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status,
PASBookView *book_view)
{
CORBA_Environment ev;
@@ -491,7 +491,7 @@ pas_book_respond_get_book_view (PASBook *book,
object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view));
- Evolution_BookListener_respond_get_view (
+ GNOME_Evolution_Addressbook_BookListener_notifyViewRequested (
book->priv->listener, status, object, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -507,7 +507,7 @@ pas_book_respond_get_book_view (PASBook *book,
*/
void
pas_book_respond_get_changes (PASBook *book,
- Evolution_BookListener_CallStatus status,
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status,
PASBookView *book_view)
{
CORBA_Environment ev;
@@ -517,7 +517,7 @@ pas_book_respond_get_changes (PASBook *book,
object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view));
- Evolution_BookListener_respond_get_changes (
+ GNOME_Evolution_Addressbook_BookListener_notifyChangesRequested (
book->priv->listener, status, object, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -539,7 +539,7 @@ pas_book_report_connection (PASBook *book,
CORBA_exception_init (&ev);
- Evolution_BookListener_report_connection_status (
+ GNOME_Evolution_Addressbook_BookListener_notifyConnectionStatus (
book->priv->listener, (CORBA_boolean) connected, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -553,12 +553,12 @@ pas_book_report_connection (PASBook *book,
static gboolean
pas_book_construct (PASBook *book,
PASBackend *backend,
- Evolution_BookListener listener,
+ GNOME_Evolution_Addressbook_BookListener listener,
PASBookGetVCardFn get_vcard,
PASBookCanWriteFn can_write,
PASBookCanWriteCardFn can_write_card)
{
- POA_Evolution_Book *servant;
+ POA_GNOME_Evolution_Addressbook_Book *servant;
CORBA_Environment ev;
CORBA_Object obj;
@@ -569,12 +569,12 @@ pas_book_construct (PASBook *book,
g_assert (can_write != NULL);
g_assert (can_write_card != NULL);
- servant = (POA_Evolution_Book *) g_new0 (BonoboObjectServant, 1);
+ servant = (POA_GNOME_Evolution_Addressbook_Book *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &pas_book_vepv;
CORBA_exception_init (&ev);
- POA_Evolution_Book__init ((PortableServer_Servant) servant, &ev);
+ POA_GNOME_Evolution_Addressbook_Book__init ((PortableServer_Servant) servant, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_free (servant);
CORBA_exception_free (&ev);
@@ -615,7 +615,7 @@ pas_book_construct (PASBook *book,
*/
PASBook *
pas_book_new (PASBackend *backend,
- Evolution_BookListener listener,
+ GNOME_Evolution_Addressbook_BookListener listener,
PASBookGetVCardFn get_vcard,
PASBookCanWriteFn can_write,
PASBookCanWriteCardFn can_write_card)
@@ -666,24 +666,24 @@ pas_book_destroy (GtkObject *object)
GTK_OBJECT_CLASS (pas_book_parent_class)->destroy (object);
}
-static POA_Evolution_Book__epv *
+static POA_GNOME_Evolution_Addressbook_Book__epv *
pas_book_get_epv (void)
{
- POA_Evolution_Book__epv *epv;
+ POA_GNOME_Evolution_Addressbook_Book__epv *epv;
- epv = g_new0 (POA_Evolution_Book__epv, 1);
+ epv = g_new0 (POA_GNOME_Evolution_Addressbook_Book__epv, 1);
- epv->get_vcard = impl_Evolution_Book_get_vcard;
- epv->can_write = impl_Evolution_Book_can_write;
- epv->can_write_card = impl_Evolution_Book_can_write_card;
- epv->create_card = impl_Evolution_Book_create_card;
- epv->remove_card = impl_Evolution_Book_remove_card;
- epv->modify_card = impl_Evolution_Book_modify_card;
- epv->check_connection = impl_Evolution_Book_check_connection;
- epv->get_static_capabilities = impl_Evolution_Book_get_static_capabilities;
- epv->get_cursor = impl_Evolution_Book_get_cursor;
- epv->get_book_view = impl_Evolution_Book_get_book_view;
- epv->get_changes = impl_Evolution_Book_get_changes;
+ epv->getVCard = impl_GNOME_Evolution_Addressbook_Book_getVCard;
+ epv->isWriteable = impl_GNOME_Evolution_Addressbook_Book_isWriteable;
+ epv->isCardWriteable = impl_GNOME_Evolution_Addressbook_Book_isCardWriteable;
+ epv->addCard = impl_GNOME_Evolution_Addressbook_Book_addCard;
+ epv->removeCard = impl_GNOME_Evolution_Addressbook_Book_removeCard;
+ epv->modifyCard = impl_GNOME_Evolution_Addressbook_Book_modifyCard;
+ epv->checkConnection = impl_GNOME_Evolution_Addressbook_Book_checkConnection;
+ epv->getStaticCapabilities = impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities;
+ epv->getCursor = impl_GNOME_Evolution_Addressbook_Book_getCursor;
+ epv->getBookView = impl_GNOME_Evolution_Addressbook_Book_getBookView;
+ epv->getChanges = impl_GNOME_Evolution_Addressbook_Book_getChanges;
return epv;
@@ -693,7 +693,7 @@ static void
pas_book_corba_class_init (void)
{
pas_book_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
- pas_book_vepv.Evolution_Book_epv = pas_book_get_epv ();
+ pas_book_vepv.GNOME_Evolution_Addressbook_Book_epv = pas_book_get_epv ();
}
static void
diff --git a/addressbook/backend/pas/pas-book.h b/addressbook/backend/pas/pas-book.h
index 68b0c60fda..3c7f5a2bde 100644
--- a/addressbook/backend/pas/pas-book.h
+++ b/addressbook/backend/pas/pas-book.h
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * A wrapper object which exports the Evolution_Book CORBA interface
+ * A wrapper object which exports the GNOME_Evolution_Addressbook_Book CORBA interface
* and which maintains a request queue.
*
* Author:
@@ -39,7 +39,7 @@ typedef struct {
char *vcard;
char *search;
char *change_id;
- Evolution_BookViewListener listener;
+ GNOME_Evolution_Addressbook_BookViewListener listener;
} PASRequest;
struct _PASBook {
@@ -59,31 +59,31 @@ typedef gboolean (*PASBookCanWriteFn) (PASBook *book);
typedef gboolean (*PASBookCanWriteCardFn) (PASBook *book, const char *id);
PASBook *pas_book_new (PASBackend *backend,
- Evolution_BookListener listener,
+ GNOME_Evolution_Addressbook_BookListener listener,
PASBookGetVCardFn get_vcard,
PASBookCanWriteFn can_write,
PASBookCanWriteCardFn can_write_card);
PASBackend *pas_book_get_backend (PASBook *book);
-Evolution_BookListener pas_book_get_listener (PASBook *book);
+GNOME_Evolution_Addressbook_BookListener pas_book_get_listener (PASBook *book);
int pas_book_check_pending (PASBook *book);
PASRequest *pas_book_pop_request (PASBook *book);
void pas_book_respond_open (PASBook *book,
- Evolution_BookListener_CallStatus status);
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status);
void pas_book_respond_create (PASBook *book,
- Evolution_BookListener_CallStatus status,
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status,
const char *id);
void pas_book_respond_remove (PASBook *book,
- Evolution_BookListener_CallStatus status);
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status);
void pas_book_respond_modify (PASBook *book,
- Evolution_BookListener_CallStatus status);
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status);
void pas_book_respond_get_cursor (PASBook *book,
- Evolution_BookListener_CallStatus status,
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status,
PASCardCursor *cursor);
void pas_book_respond_get_book_view (PASBook *book,
- Evolution_BookListener_CallStatus status,
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status,
PASBookView *book_view);
void pas_book_respond_get_changes (PASBook *book,
- Evolution_BookListener_CallStatus status,
+ GNOME_Evolution_Addressbook_BookListener_CallStatus status,
PASBookView *book_view);
void pas_book_report_connection (PASBook *book,
gboolean connected);
diff --git a/addressbook/backend/pas/pas-card-cursor.c b/addressbook/backend/pas/pas-card-cursor.c
index c2bbe1c9b0..a7f56275fc 100644
--- a/addressbook/backend/pas/pas-card-cursor.c
+++ b/addressbook/backend/pas/pas-card-cursor.c
@@ -25,7 +25,7 @@ static BonoboObjectClass *parent_class;
/*
* The VEPV for the CardCursor object
*/
-static POA_Evolution_CardCursor__vepv cursor_vepv;
+static POA_GNOME_Evolution_Addressbook_CardCursor__vepv cursor_vepv;
/*
* Implemented GtkObject::destroy
@@ -77,18 +77,18 @@ impl_pas_card_cursor_get_nth (PortableServer_Servant servant,
* If you want users to derive classes from your implementation
* you need to support this method.
*/
-POA_Evolution_CardCursor__epv *
+POA_GNOME_Evolution_Addressbook_CardCursor__epv *
pas_card_cursor_get_epv (void)
{
- POA_Evolution_CardCursor__epv *epv;
+ POA_GNOME_Evolution_Addressbook_CardCursor__epv *epv;
- epv = g_new0 (POA_Evolution_CardCursor__epv, 1);
+ epv = g_new0 (POA_GNOME_Evolution_Addressbook_CardCursor__epv, 1);
/*
* This is the method invoked by CORBA
*/
- epv->get_length = impl_pas_card_cursor_get_length;
- epv->get_nth = impl_pas_card_cursor_get_nth;
+ epv->count = impl_pas_card_cursor_get_length;
+ epv->getNth = impl_pas_card_cursor_get_nth;
return epv;
}
@@ -97,7 +97,7 @@ static void
init_pas_card_cursor_corba_class (void)
{
cursor_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
- cursor_vepv.Evolution_CardCursor_epv = pas_card_cursor_get_epv ();
+ cursor_vepv.GNOME_Evolution_Addressbook_CardCursor_epv = pas_card_cursor_get_epv ();
}
static void
@@ -146,7 +146,7 @@ pas_card_cursor_get_type (void)
PASCardCursor *
pas_card_cursor_construct (PASCardCursor *cursor,
- Evolution_CardCursor corba_cursor,
+ GNOME_Evolution_Addressbook_CardCursor corba_cursor,
PASCardCursorLengthFunc get_length,
PASCardCursorNthFunc get_nth,
gpointer data)
@@ -178,17 +178,17 @@ pas_card_cursor_construct (PASCardCursor *cursor,
* This routine creates the ORBit CORBA server and initializes the
* CORBA side of things
*/
-static Evolution_CardCursor
+static GNOME_Evolution_Addressbook_CardCursor
create_cursor (BonoboObject *cursor)
{
- POA_Evolution_CardCursor *servant;
+ POA_GNOME_Evolution_Addressbook_CardCursor *servant;
CORBA_Environment ev;
- servant = (POA_Evolution_CardCursor *) g_new0 (BonoboObjectServant, 1);
+ servant = (POA_GNOME_Evolution_Addressbook_CardCursor *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &cursor_vepv;
CORBA_exception_init (&ev);
- POA_Evolution_CardCursor__init ((PortableServer_Servant) servant, &ev);
+ POA_GNOME_Evolution_Addressbook_CardCursor__init ((PortableServer_Servant) servant, &ev);
if (ev._major != CORBA_NO_EXCEPTION){
g_free (servant);
CORBA_exception_free (&ev);
@@ -200,7 +200,7 @@ create_cursor (BonoboObject *cursor)
/*
* Activates the CORBA object.
*/
- return (Evolution_CardCursor) bonobo_object_activate_servant (cursor, servant);
+ return (GNOME_Evolution_Addressbook_CardCursor) bonobo_object_activate_servant (cursor, servant);
}
PASCardCursor *
@@ -209,7 +209,7 @@ pas_card_cursor_new (PASCardCursorLengthFunc get_length,
gpointer data)
{
PASCardCursor *cursor;
- Evolution_CardCursor corba_cursor;
+ GNOME_Evolution_Addressbook_CardCursor corba_cursor;
cursor = gtk_type_new (pas_card_cursor_get_type ());
corba_cursor = create_cursor (BONOBO_OBJECT (cursor));
diff --git a/addressbook/backend/pas/pas-card-cursor.h b/addressbook/backend/pas/pas-card-cursor.h
index 300e3e3ce1..d7d19ecebd 100644
--- a/addressbook/backend/pas/pas-card-cursor.h
+++ b/addressbook/backend/pas/pas-card-cursor.h
@@ -37,13 +37,13 @@ PASCardCursor *pas_card_cursor_new (PASCardCursorLengthFunc get_length,
PASCardCursorNthFunc get_nth,
gpointer data);
PASCardCursor *pas_card_cursor_construct (PASCardCursor *cursor,
- Evolution_CardCursor corba_cursor,
+ GNOME_Evolution_Addressbook_CardCursor corba_cursor,
PASCardCursorLengthFunc get_length,
PASCardCursorNthFunc get_nth,
gpointer data);
GtkType pas_card_cursor_get_type (void);
-POA_Evolution_CardCursor__epv *
+POA_GNOME_Evolution_Addressbook_CardCursor__epv *
pas_card_cursor_get_epv (void);
/* Fetching cards. */
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 13:55:50 +0800