aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/backend/ebook/Makefile.am2
-rw-r--r--addressbook/backend/ebook/e-book-listener.c90
-rw-r--r--addressbook/backend/ebook/e-book-listener.h8
-rw-r--r--addressbook/backend/ebook/e-book-view-listener.c44
-rw-r--r--addressbook/backend/ebook/e-book-view-listener.h2
-rw-r--r--addressbook/backend/ebook/e-book-view.c10
-rw-r--r--addressbook/backend/ebook/e-book-view.h2
-rw-r--r--addressbook/backend/ebook/e-book.c54
-rw-r--r--addressbook/backend/ebook/e-card-cursor.c22
-rw-r--r--addressbook/backend/ebook/e-card-cursor.h4
-rw-r--r--addressbook/backend/idl/addressbook.idl68
-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
-rw-r--r--addressbook/gui/component/addressbook-component.c2
-rw-r--r--addressbook/gui/component/e-ldap-storage.c2
-rw-r--r--addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl8
-rw-r--r--addressbook/gui/component/select-names/Makefile.am4
-rw-r--r--addressbook/gui/component/select-names/e-select-names-bonobo.c32
-rw-r--r--addressbook/gui/component/select-names/e-select-names-bonobo.h2
29 files changed, 367 insertions, 361 deletions
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index 7fef103315..1dc9618851 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -14,7 +14,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/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c
index fb96329825..abdda55b59 100644
--- a/addressbook/backend/ebook/e-book-listener.c
+++ b/addressbook/backend/ebook/e-book-listener.c
@@ -13,7 +13,7 @@
#include <gtk/gtksignal.h>
#include "e-book-listener.h"
-static EBookStatus e_book_listener_convert_status (Evolution_BookListener_CallStatus status);
+static EBookStatus e_book_listener_convert_status (GNOME_Evolution_Addressbook_BookListener_CallStatus status);
enum {
RESPONSES_QUEUED,
@@ -23,7 +23,7 @@ enum {
static guint e_book_listener_signals [LAST_SIGNAL];
static BonoboObjectClass *e_book_listener_parent_class;
-POA_Evolution_BookListener__vepv e_book_listener_vepv;
+POA_GNOME_Evolution_Addressbook_BookListener__vepv e_book_listener_vepv;
struct _EBookListenerPrivate {
GList *response_queue;
@@ -79,7 +79,7 @@ e_book_listener_queue_generic_response (EBookListener *listener,
static void
e_book_listener_queue_open_response (EBookListener *listener,
EBookStatus status,
- Evolution_Book book)
+ GNOME_Evolution_Addressbook_Book book)
{
EBookListenerResponse *resp;
@@ -128,7 +128,7 @@ e_book_listener_queue_create_card_response (EBookListener *listener,
static void
e_book_listener_queue_get_cursor_response (EBookListener *listener,
EBookStatus status,
- Evolution_CardCursor cursor)
+ GNOME_Evolution_Addressbook_CardCursor cursor)
{
EBookListenerResponse *resp;
@@ -144,7 +144,7 @@ e_book_listener_queue_get_cursor_response (EBookListener *listener,
static void
e_book_listener_queue_get_view_response (EBookListener *listener,
EBookStatus status,
- Evolution_BookView book_view)
+ GNOME_Evolution_Addressbook_BookView book_view)
{
EBookListenerResponse *resp;
@@ -160,7 +160,7 @@ e_book_listener_queue_get_view_response (EBookListener *listener,
static void
e_book_listener_queue_get_changes_response (EBookListener *listener,
EBookStatus status,
- Evolution_BookView book_view)
+ GNOME_Evolution_Addressbook_BookView book_view)
{
EBookListenerResponse *resp;
@@ -189,8 +189,8 @@ e_book_listener_queue_link_status (EBookListener *listener,
static void
impl_BookListener_respond_create_card (PortableServer_Servant servant,
- const Evolution_BookListener_CallStatus status,
- const Evolution_CardId id,
+ const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
+ const GNOME_Evolution_Addressbook_CardId id,
CORBA_Environment *ev)
{
EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
@@ -203,7 +203,7 @@ impl_BookListener_respond_create_card (PortableServer_Servant
static void
impl_BookListener_respond_remove_card (PortableServer_Servant servant,
- const Evolution_BookListener_CallStatus status,
+ const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
CORBA_Environment *ev)
{
EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
@@ -215,7 +215,7 @@ impl_BookListener_respond_remove_card (PortableServer_Servant servant,
static void
impl_BookListener_respond_modify_card (PortableServer_Servant servant,
- const Evolution_BookListener_CallStatus status,
+ const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
CORBA_Environment *ev)
{
EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
@@ -227,12 +227,12 @@ impl_BookListener_respond_modify_card (PortableServer_Servant servant,
static void
impl_BookListener_respond_get_cursor (PortableServer_Servant servant,
- const Evolution_BookListener_CallStatus status,
- const Evolution_CardCursor cursor,
+ const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
+ const GNOME_Evolution_Addressbook_CardCursor cursor,
CORBA_Environment *ev)
{
EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
- Evolution_CardCursor cursor_copy;
+ GNOME_Evolution_Addressbook_CardCursor cursor_copy;
cursor_copy = CORBA_Object_duplicate (cursor, ev);
@@ -249,12 +249,12 @@ impl_BookListener_respond_get_cursor (PortableServer_Servant servant,
static void
impl_BookListener_respond_get_view (PortableServer_Servant servant,
- const Evolution_BookListener_CallStatus status,
- const Evolution_BookView book_view,
+ const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
+ const GNOME_Evolution_Addressbook_BookView book_view,
CORBA_Environment *ev)
{
EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
- Evolution_BookView book_view_copy;
+ GNOME_Evolution_Addressbook_BookView book_view_copy;
book_view_copy = CORBA_Object_duplicate (book_view, ev);
@@ -271,12 +271,12 @@ impl_BookListener_respond_get_view (PortableServer_Servant servant,
static void
impl_BookListener_respond_get_changes (PortableServer_Servant servant,
- const Evolution_BookListener_CallStatus status,
- const Evolution_BookView book_view,
+ const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
+ const GNOME_Evolution_Addressbook_BookView book_view,
CORBA_Environment *ev)
{
EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
- Evolution_BookView book_view_copy;
+ GNOME_Evolution_Addressbook_BookView book_view_copy;
book_view_copy = CORBA_Object_duplicate (book_view, ev);
@@ -293,12 +293,12 @@ impl_BookListener_respond_get_changes (PortableServer_Servant servant,
static void
impl_BookListener_respond_open_book (PortableServer_Servant servant,
- const Evolution_BookListener_CallStatus status,
- const Evolution_Book book,
+ const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
+ const GNOME_Evolution_Addressbook_Book book,
CORBA_Environment *ev)
{
EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
- Evolution_Book book_copy;
+ GNOME_Evolution_Addressbook_Book book_copy;
book_copy = CORBA_Object_duplicate (book, ev);
@@ -384,20 +384,20 @@ e_book_listener_pop_response (EBookListener *listener)
}
static EBookStatus
-e_book_listener_convert_status (const Evolution_BookListener_CallStatus status)
+e_book_listener_convert_status (const GNOME_Evolution_Addressbook_BookListener_CallStatus status)
{
switch (status) {
- case Evolution_BookListener_Success:
+ case GNOME_Evolution_Addressbook_BookListener_Success:
return E_BOOK_STATUS_SUCCESS;
- case Evolution_BookListener_RepositoryOffline:
+ case GNOME_Evolution_Addressbook_BookListener_RepositoryOffline:
return E_BOOK_STATUS_REPOSITORY_OFFLINE;
- case Evolution_BookListener_PermissionDenied:
+ case GNOME_Evolution_Addressbook_BookListener_PermissionDenied:
return E_BOOK_STATUS_PERMISSION_DENIED;
- case Evolution_BookListener_CardNotFound:
+ case GNOME_Evolution_Addressbook_BookListener_CardNotFound:
return E_BOOK_STATUS_CARD_NOT_FOUND;
- case Evolution_BookListener_ProtocolNotSupported:
+ case GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported:
return E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED;
- case Evolution_BookListener_OtherError:
+ case GNOME_Evolution_Addressbook_BookListener_OtherError:
return E_BOOK_STATUS_OTHER_ERROR;
default:
g_warning ("e_book_listener_convert_status: Unknown status "
@@ -410,19 +410,19 @@ e_book_listener_convert_status (const Evolution_BookListener_CallStatus status)
static EBookListener *
e_book_listener_construct (EBookListener *listener)
{
- POA_Evolution_BookListener *servant;
+ POA_GNOME_Evolution_Addressbook_BookListener *servant;
CORBA_Environment ev;
CORBA_Object obj;
g_assert (listener != NULL);
g_assert (E_IS_BOOK_LISTENER (listener));
- servant = (POA_Evolution_BookListener *) g_new0 (BonoboObjectServant, 1);
+ servant = (POA_GNOME_Evolution_Addressbook_BookListener *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &e_book_listener_vepv;
CORBA_exception_init (&ev);
- POA_Evolution_BookListener__init ((PortableServer_Servant) servant, &ev);
+ POA_GNOME_Evolution_Addressbook_BookListener__init ((PortableServer_Servant) servant, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_free (servant);
CORBA_exception_free (&ev);
@@ -547,25 +547,25 @@ e_book_listener_destroy (GtkObject *object)
GTK_OBJECT_CLASS (e_book_listener_parent_class)->destroy (object);
}
-POA_Evolution_BookListener__epv *
+POA_GNOME_Evolution_Addressbook_BookListener__epv *
e_book_listener_get_epv (void)
{
- POA_Evolution_BookListener__epv *epv;
+ POA_GNOME_Evolution_Addressbook_BookListener__epv *epv;
- epv = g_new0 (POA_Evolution_BookListener__epv, 1);
+ epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookListener__epv, 1);
- epv->report_open_book_progress = impl_BookListener_report_open_book_progress;
- epv->respond_open_book = impl_BookListener_respond_open_book;
+ epv->notifyOpenBookProgress = impl_BookListener_report_open_book_progress;
+ epv->notifyBookOpened = impl_BookListener_respond_open_book;
- epv->respond_create_card = impl_BookListener_respond_create_card;
- epv->respond_remove_card = impl_BookListener_respond_remove_card;
- epv->respond_modify_card = impl_BookListener_respond_modify_card;
+ epv->notifyCardCreated = impl_BookListener_respond_create_card;
+ epv->notifyCardRemoved = impl_BookListener_respond_remove_card;
+ epv->notifyCardModified = impl_BookListener_respond_modify_card;
- epv->respond_get_cursor = impl_BookListener_respond_get_cursor;
- epv->respond_get_view = impl_BookListener_respond_get_view;
- epv->respond_get_changes = impl_BookListener_respond_get_changes;
+ epv->notifyCursorRequested = impl_BookListener_respond_get_cursor;
+ epv->notifyViewRequested = impl_BookListener_respond_get_view;
+ epv->notifyChangesRequested = impl_BookListener_respond_get_changes;
- epv->report_connection_status = impl_BookListener_report_connection_status;
+ epv->notifyConnectionStatus = impl_BookListener_report_connection_status;
return epv;
}
@@ -574,7 +574,7 @@ static void
e_book_listener_corba_class_init (void)
{
e_book_listener_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
- e_book_listener_vepv.Evolution_BookListener_epv = e_book_listener_get_epv ();
+ e_book_listener_vepv.GNOME_Evolution_Addressbook_BookListener_epv = e_book_listener_get_epv ();
}
static void
diff --git a/addressbook/backend/ebook/e-book-listener.h b/addressbook/backend/ebook/e-book-listener.h
index 3e4a160d33..d553324ee4 100644
--- a/addressbook/backend/ebook/e-book-listener.h
+++ b/addressbook/backend/ebook/e-book-listener.h
@@ -59,13 +59,13 @@ typedef struct {
EBookStatus status;
/* For OpenBookResponse */
- Evolution_Book book;
+ GNOME_Evolution_Addressbook_Book book;
/* For GetCursorResponse */
- Evolution_CardCursor cursor;
+ GNOME_Evolution_Addressbook_CardCursor cursor;
/* For GetBookViewReponse */
- Evolution_BookView book_view;
+ GNOME_Evolution_Addressbook_BookView book_view;
/* For OpenProgressEvent */
char *msg;
@@ -83,7 +83,7 @@ int e_book_listener_check_pending (EBookListener *listener);
EBookListenerResponse *e_book_listener_pop_response (EBookListener *listener);
GtkType e_book_listener_get_type (void);
-POA_Evolution_BookListener__epv *e_book_listener_get_epv (void);
+POA_GNOME_Evolution_Addressbook_BookListener__epv *e_book_listener_get_epv (void);
#define E_BOOK_LISTENER_TYPE (e_book_listener_get_type ())
#define E_BOOK_LISTENER(o) (GTK_CHECK_CAST ((o), E_BOOK_LISTENER_TYPE, EBookListener))
diff --git a/addressbook/backend/ebook/e-book-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c
index cd1bdc6000..23133ecc22 100644
--- a/addressbook/backend/ebook/e-book-view-listener.c
+++ b/addressbook/backend/ebook/e-book-view-listener.c
@@ -23,7 +23,7 @@ enum {
static guint e_book_view_listener_signals [LAST_SIGNAL];
static BonoboObjectClass *e_book_view_listener_parent_class;
-POA_Evolution_BookViewListener__vepv e_book_view_listener_vepv;
+POA_GNOME_Evolution_Addressbook_BookViewListener__vepv e_book_view_listener_vepv;
struct _EBookViewListenerPrivate {
GList *response_queue;
@@ -99,7 +99,7 @@ e_book_view_listener_queue_id_event (EBookViewListener *listener,
static void
e_book_view_listener_queue_sequence_event (EBookViewListener *listener,
EBookViewListenerOperation op,
- const Evolution_VCardList *cards)
+ const GNOME_Evolution_Addressbook_VCardList *cards)
{
EBookViewListenerResponse *resp;
int i;
@@ -137,8 +137,8 @@ e_book_view_listener_queue_message_event (EBookViewListener *listener,
}
static void
-impl_BookViewListener_signal_card_added (PortableServer_Servant servant,
- const Evolution_VCardList *cards,
+impl_BookViewListener_notify_card_added (PortableServer_Servant servant,
+ const GNOME_Evolution_Addressbook_VCardList *cards,
CORBA_Environment *ev)
{
EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
@@ -148,8 +148,8 @@ impl_BookViewListener_signal_card_added (PortableServer_Servant servant,
}
static void
-impl_BookViewListener_signal_card_removed (PortableServer_Servant servant,
- const Evolution_CardId id,
+impl_BookViewListener_notify_card_removed (PortableServer_Servant servant,
+ const GNOME_Evolution_Addressbook_CardId id,
CORBA_Environment *ev)
{
EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
@@ -159,8 +159,8 @@ impl_BookViewListener_signal_card_removed (PortableServer_Servant servant,
}
static void
-impl_BookViewListener_signal_card_changed (PortableServer_Servant servant,
- const Evolution_VCardList *cards,
+impl_BookViewListener_notify_card_changed (PortableServer_Servant servant,
+ const GNOME_Evolution_Addressbook_VCardList *cards,
CORBA_Environment *ev)
{
EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
@@ -170,7 +170,7 @@ impl_BookViewListener_signal_card_changed (PortableServer_Servant servant,
}
static void
-impl_BookViewListener_signal_sequence_complete (PortableServer_Servant servant,
+impl_BookViewListener_notify_sequence_complete (PortableServer_Servant servant,
CORBA_Environment *ev)
{
EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
@@ -179,7 +179,7 @@ impl_BookViewListener_signal_sequence_complete (PortableServer_Servant servant,
}
static void
-impl_BookViewListener_signal_status_message (PortableServer_Servant servant,
+impl_BookViewListener_notify_status_message (PortableServer_Servant servant,
const char *message,
CORBA_Environment *ev)
{
@@ -238,19 +238,19 @@ e_book_view_listener_pop_response (EBookViewListener *listener)
static EBookViewListener *
e_book_view_listener_construct (EBookViewListener *listener)
{
- POA_Evolution_BookViewListener *servant;
+ POA_GNOME_Evolution_Addressbook_BookViewListener *servant;
CORBA_Environment ev;
CORBA_Object obj;
g_assert (listener != NULL);
g_assert (E_IS_BOOK_VIEW_LISTENER (listener));
- servant = (POA_Evolution_BookViewListener *) g_new0 (BonoboObjectServant, 1);
+ servant = (POA_GNOME_Evolution_Addressbook_BookViewListener *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &e_book_view_listener_vepv;
CORBA_exception_init (&ev);
- POA_Evolution_BookViewListener__init ((PortableServer_Servant) servant, &ev);
+ POA_GNOME_Evolution_Addressbook_BookViewListener__init ((PortableServer_Servant) servant, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_free (servant);
CORBA_exception_free (&ev);
@@ -336,18 +336,18 @@ e_book_view_listener_destroy (GtkObject *object)
GTK_OBJECT_CLASS (e_book_view_listener_parent_class)->destroy (object);
}
-POA_Evolution_BookViewListener__epv *
+POA_GNOME_Evolution_Addressbook_BookViewListener__epv *
e_book_view_listener_get_epv (void)
{
- POA_Evolution_BookViewListener__epv *epv;
+ POA_GNOME_Evolution_Addressbook_BookViewListener__epv *epv;
- epv = g_new0 (POA_Evolution_BookViewListener__epv, 1);
+ epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookViewListener__epv, 1);
- epv->signal_card_changed = impl_BookViewListener_signal_card_changed;
- epv->signal_card_removed = impl_BookViewListener_signal_card_removed;
- epv->signal_card_added = impl_BookViewListener_signal_card_added;
- epv->signal_sequence_complete = impl_BookViewListener_signal_sequence_complete;
- epv->signal_status_message = impl_BookViewListener_signal_status_message;
+ epv->notifyCardChanged = impl_BookViewListener_notify_card_changed;
+ epv->notifyCardRemoved = impl_BookViewListener_notify_card_removed;
+ epv->notifyCardAdded = impl_BookViewListener_notify_card_added;
+ epv->notifySequenceComplete = impl_BookViewListener_notify_sequence_complete;
+ epv->notifyStatusMessage = impl_BookViewListener_notify_status_message;
return epv;
}
@@ -356,7 +356,7 @@ static void
e_book_view_listener_corba_class_init (void)
{
e_book_view_listener_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
- e_book_view_listener_vepv.Evolution_BookViewListener_epv = e_book_view_listener_get_epv ();
+ e_book_view_listener_vepv.GNOME_Evolution_Addressbook_BookViewListener_epv = e_book_view_listener_get_epv ();
}
static void
diff --git a/addressbook/backend/ebook/e-book-view-listener.h b/addressbook/backend/ebook/e-book-view-listener.h
index 5a535a209a..addf91e702 100644
--- a/addressbook/backend/ebook/e-book-view-listener.h
+++ b/addressbook/backend/ebook/e-book-view-listener.h
@@ -64,7 +64,7 @@ int e_book_view_listener_check_pending (EBookViewListene
EBookViewListenerResponse *e_book_view_listener_pop_response (EBookViewListener *listener);
GtkType e_book_view_listener_get_type (void);
-POA_Evolution_BookViewListener__epv *e_book_view_listener_get_epv (void);
+POA_GNOME_Evolution_Addressbook_BookViewListener__epv *e_book_view_listener_get_epv (void);
#define E_BOOK_VIEW_LISTENER_TYPE (e_book_view_listener_get_type ())
#define E_BOOK_VIEW_LISTENER(o) (GTK_CHECK_CAST ((o), E_BOOK_VIEW_LISTENER_TYPE, EBookViewListener))
diff --git a/addressbook/backend/ebook/e-book-view.c b/addressbook/backend/ebook/e-book-view.c
index 6e0379f2cc..8faebe140f 100644
--- a/addressbook/backend/ebook/e-book-view.c
+++ b/addressbook/backend/ebook/e-book-view.c
@@ -20,7 +20,7 @@
GtkObjectClass *e_book_view_parent_class;
struct _EBookViewPrivate {
- Evolution_BookView corba_book_view;
+ GNOME_Evolution_Addressbook_BookView corba_book_view;
EBookViewListener *listener;
@@ -125,7 +125,7 @@ e_book_view_check_listener_queue (EBookViewListener *listener, EBookView *book_v
}
static gboolean
-e_book_view_construct (EBookView *book_view, Evolution_BookView corba_book_view, EBookViewListener *listener)
+e_book_view_construct (EBookView *book_view, GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener)
{
CORBA_Environment ev;
g_return_val_if_fail (book_view != NULL, FALSE);
@@ -144,7 +144,7 @@ e_book_view_construct (EBookView *book_view, Evolution_BookView corba_book_view,
return FALSE;
}
- Evolution_BookView_ref(book_view->priv->corba_book_view, &ev);
+ GNOME_Evolution_Addressbook_BookView_ref(book_view->priv->corba_book_view, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_view_construct: Exception reffing corba_book_view.\n");
@@ -177,7 +177,7 @@ e_book_view_construct (EBookView *book_view, Evolution_BookView corba_book_view,
* e_book_view_new:
*/
EBookView *
-e_book_view_new (Evolution_BookView corba_book_view, EBookViewListener *listener)
+e_book_view_new (GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener)
{
EBookView *book_view;
@@ -209,7 +209,7 @@ e_book_view_destroy (GtkObject *object)
if (book_view->priv->corba_book_view) {
CORBA_exception_init (&ev);
- Evolution_BookView_unref(book_view->priv->corba_book_view, &ev);
+ GNOME_Evolution_Addressbook_BookView_unref(book_view->priv->corba_book_view, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("EBookView: Exception while unreffing BookView\n");
diff --git a/addressbook/backend/ebook/e-book-view.h b/addressbook/backend/ebook/e-book-view.h
index bd64c9dbc7..35126d4fce 100644
--- a/addressbook/backend/ebook/e-book-view.h
+++ b/addressbook/backend/ebook/e-book-view.h
@@ -41,7 +41,7 @@ struct _EBookViewClass {
};
/* Creating a new addressbook. */
-EBookView *e_book_view_new (Evolution_BookView corba_book_view, EBookViewListener *listener);
+EBookView *e_book_view_new (GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener);
GtkType e_book_view_get_type (void);
void e_book_view_get_book_view_listener (EBookView *book_view);
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index ce130a5888..65925e5036 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -29,10 +29,10 @@ typedef enum {
} EBookLoadState;
struct _EBookPrivate {
- Evolution_BookFactory book_factory;
+ GNOME_Evolution_Addressbook_BookFactory book_factory;
EBookListener *listener;
- Evolution_Book corba_book;
+ GNOME_Evolution_Addressbook_Book corba_book;
EBookLoadState load_state;
@@ -160,7 +160,7 @@ e_book_do_response_get_cursor (EBook *book,
((EBookCursorCallback) op->cb) (book, resp->status, cursor, op->closure);
/*
- * Release the remote Evolution_Book in the PAS.
+ * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
*/
CORBA_exception_init (&ev);
@@ -168,7 +168,7 @@ e_book_do_response_get_cursor (EBook *book,
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_do_response_get_cursor: Exception unref'ing "
- "remote Evolution_CardCursor interface!\n");
+ "remote GNOME_Evolution_Addressbook_CardCursor interface!\n");
CORBA_exception_free (&ev);
CORBA_exception_init (&ev);
}
@@ -177,7 +177,7 @@ e_book_do_response_get_cursor (EBook *book,
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_do_response_get_cursor: Exception releasing "
- "remote Evolution_CardCursor interface!\n");
+ "remote GNOME_Evolution_Addressbook_CardCursor interface!\n");
}
CORBA_exception_free (&ev);
@@ -211,7 +211,7 @@ e_book_do_response_get_view (EBook *book,
((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure);
/*
- * Release the remote Evolution_Book in the PAS.
+ * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
*/
CORBA_exception_init (&ev);
@@ -219,7 +219,7 @@ e_book_do_response_get_view (EBook *book,
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_do_response_get_view: Exception unref'ing "
- "remote Evolution_BookView interface!\n");
+ "remote GNOME_Evolution_Addressbook_BookView interface!\n");
CORBA_exception_free (&ev);
CORBA_exception_init (&ev);
}
@@ -228,7 +228,7 @@ e_book_do_response_get_view (EBook *book,
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_do_response_get_view: Exception releasing "
- "remote Evolution_BookView interface!\n");
+ "remote GNOME_Evolution_Addressbook_BookView interface!\n");
}
CORBA_exception_free (&ev);
@@ -255,7 +255,7 @@ e_book_do_response_get_changes (EBook *book,
return;
}
- book_view = e_book_view_new(resp->book_view, op->listener);
+ book_view = e_book_view_new (resp->book_view, op->listener);
if (op->cb)
((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure);
@@ -419,7 +419,7 @@ e_book_load_uri (EBook *book,
*/
CORBA_exception_init (&ev);
- Evolution_BookFactory_open_book (
+ GNOME_Evolution_Addressbook_BookFactory_openBook (
book->priv->book_factory, uri,
bonobo_object_corba_objref (BONOBO_OBJECT (book->priv->listener)),
&ev);
@@ -462,7 +462,7 @@ e_book_unload_uri (EBook *book)
}
/*
- * Release the remote Evolution_Book in the PAS.
+ * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
*/
CORBA_exception_init (&ev);
@@ -470,7 +470,7 @@ e_book_unload_uri (EBook *book)
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_unload_uri: Exception unref'ing "
- "remote Evolution_Book interface!\n");
+ "remote GNOME_Evolution_Addressbook_Book interface!\n");
CORBA_exception_free (&ev);
CORBA_exception_init (&ev);
}
@@ -504,7 +504,7 @@ e_book_get_static_capabilities (EBook *book)
return g_strdup("");
}
- temp = Evolution_Book_get_static_capabilities(book->priv->corba_book, &ev);
+ temp = GNOME_Evolution_Addressbook_Book_getStaticCapabilities(book->priv->corba_book, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_get_static_capabilities: Exception "
@@ -531,7 +531,7 @@ e_book_construct (EBook *book)
* Connect to the Personal Addressbook Server.
*/
- book->priv->book_factory = (Evolution_BookFactory)
+ book->priv->book_factory = (GNOME_Evolution_Addressbook_BookFactory)
oaf_activate_from_id (CARDSERVER_OAF_ID, 0, NULL, NULL);
if (book->priv->book_factory == CORBA_OBJECT_NIL) {
g_warning ("e_book_construct: Could not obtain a handle "
@@ -616,8 +616,8 @@ e_book_get_vcard (EBook *book,
CORBA_exception_init (&ev);
- vcard = Evolution_Book_get_vcard (book->priv->corba_book,
- (Evolution_CardId) id,
+ vcard = GNOME_Evolution_Addressbook_Book_getVCard (book->priv->corba_book,
+ (GNOME_Evolution_Addressbook_CardId) id,
&ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -691,8 +691,8 @@ e_book_remove_card_by_id (EBook *book,
CORBA_exception_init (&ev);
- Evolution_Book_remove_card (
- book->priv->corba_book, (const Evolution_CardId) id, &ev);
+ GNOME_Evolution_Addressbook_Book_removeCard (
+ book->priv->corba_book, (const GNOME_Evolution_Addressbook_CardId) id, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_remove_card_by_id: CORBA exception "
@@ -769,8 +769,8 @@ e_book_add_vcard (EBook *book,
CORBA_exception_init (&ev);
- Evolution_Book_create_card (
- book->priv->corba_book, (const Evolution_VCard) vcard, &ev);
+ GNOME_Evolution_Addressbook_Book_addCard (
+ book->priv->corba_book, (const GNOME_Evolution_Addressbook_VCard) vcard, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_add_vcard: Exception adding card to PAS!\n");
@@ -846,8 +846,8 @@ e_book_commit_vcard (EBook *book,
CORBA_exception_init (&ev);
- Evolution_Book_modify_card (
- book->priv->corba_book, (const Evolution_VCard) vcard, &ev);
+ GNOME_Evolution_Addressbook_Book_modifyCard (
+ book->priv->corba_book, (const GNOME_Evolution_Addressbook_VCard) vcard, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_commit_vcard: Exception "
@@ -881,7 +881,7 @@ e_book_check_connection (EBook *book)
CORBA_exception_init (&ev);
- Evolution_Book_check_connection (book->priv->corba_book, &ev);
+ GNOME_Evolution_Addressbook_Book_checkConnection (book->priv->corba_book, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_check_connection: Exception "
@@ -912,7 +912,7 @@ gboolean e_book_get_cursor (EBook *book,
CORBA_exception_init (&ev);
- Evolution_Book_get_cursor (book->priv->corba_book, query, &ev);
+ GNOME_Evolution_Addressbook_Book_getCursor (book->priv->corba_book, query, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_get_all_cards: Exception "
@@ -948,7 +948,7 @@ gboolean e_book_get_book_view (EBook *book,
CORBA_exception_init (&ev);
- Evolution_Book_get_book_view (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), query, &ev);
+ GNOME_Evolution_Addressbook_Book_getBookView (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), query, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_get_book_view: Exception "
@@ -984,7 +984,7 @@ gboolean e_book_get_changes (EBook *book,
CORBA_exception_init (&ev);
- Evolution_Book_get_changes (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), changeid, &ev);
+ GNOME_Evolution_Addressbook_Book_getChanges (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), changeid, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_changes: Exception "
@@ -1020,7 +1020,7 @@ e_book_get_name (EBook *book)
CORBA_exception_init (&ev);
- name = Evolution_Book_get_name (book->priv->corba_book, &ev);
+ name = GNOME_Evolution_Addressbook_Book_getName (book->priv->corba_book, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_get_name: Exception getting name from PAS!\n");
diff --git a/addressbook/backend/ebook/e-card-cursor.c b/addressbook/backend/ebook/e-card-cursor.c
index 1618a6ddee..faf402d1e7 100644
--- a/addressbook/backend/ebook/e-card-cursor.c
+++ b/addressbook/backend/ebook/e-card-cursor.c
@@ -12,7 +12,7 @@
#include "e-card-cursor.h"
struct _ECardCursorPrivate {
- Evolution_CardCursor corba_cursor;
+ GNOME_Evolution_Addressbook_CardCursor corba_cursor;
};
/*
@@ -31,7 +31,7 @@ e_card_cursor_destroy (GtkObject *object)
CORBA_exception_init (&ev);
- Evolution_CardCursor_unref( cursor->priv->corba_cursor, &ev );
+ GNOME_Evolution_Addressbook_CardCursor_unref( cursor->priv->corba_cursor, &ev );
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("e_card_cursor_destroy: Exception unreffing "
@@ -71,7 +71,7 @@ e_card_cursor_get_length (ECardCursor *cursor)
CORBA_exception_init (&ev);
- ret_val = Evolution_CardCursor_get_length(cursor->priv->corba_cursor, &ev);
+ ret_val = GNOME_Evolution_Addressbook_CardCursor_count (cursor->priv->corba_cursor, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("e_card_cursor_get_length: Exception during "
@@ -107,7 +107,7 @@ e_card_cursor_get_nth (ECardCursor *cursor,
CORBA_exception_init (&en);
- vcard = Evolution_CardCursor_get_nth(cursor->priv->corba_cursor, n, &en);
+ vcard = GNOME_Evolution_Addressbook_CardCursor_getNth(cursor->priv->corba_cursor, n, &en);
if (en._major != CORBA_NO_EXCEPTION) {
g_warning("e_card_cursor_get_nth: Exception during "
@@ -169,16 +169,16 @@ e_card_cursor_get_type (void)
/**
* e_card_cursor_construct:
* @cursor: an #ECardCursor object
- * @corba_cursor: an #Evolution_CardCursor
+ * @corba_cursor: an #GNOME_Evolution_Addressbook_CardCursor
*
- * Wraps an #Evolution_CardCursor object inside the #ECardCursor
+ * Wraps an #GNOME_Evolution_Addressbook_CardCursor object inside the #ECardCursor
* @cursor object.
*
* Returns: a new #ECardCursor on success, or %NULL on failure.
*/
ECardCursor *
e_card_cursor_construct (ECardCursor *cursor,
- Evolution_CardCursor corba_cursor)
+ GNOME_Evolution_Addressbook_CardCursor corba_cursor)
{
CORBA_Environment ev;
g_return_val_if_fail (cursor != NULL, NULL);
@@ -199,7 +199,7 @@ e_card_cursor_construct (ECardCursor *cursor,
CORBA_exception_init (&ev);
}
- Evolution_CardCursor_ref(cursor->priv->corba_cursor, &ev);
+ GNOME_Evolution_Addressbook_CardCursor_ref(cursor->priv->corba_cursor, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("e_card_cursor_construct: Exception reffing "
@@ -216,15 +216,15 @@ e_card_cursor_construct (ECardCursor *cursor,
/**
* e_card_cursor_new:
- * @cursor: the #Evolution_CardCursor to be wrapped
+ * @cursor: the #GNOME_Evolution_Addressbook_CardCursor to be wrapped
*
- * Creates a new #ECardCursor, which wraps an #Evolution_CardCursor
+ * Creates a new #ECardCursor, which wraps an #GNOME_Evolution_Addressbook_CardCursor
* object.
*
* Returns: a new #ECardCursor on success, or %NULL on failure.
*/
ECardCursor *
-e_card_cursor_new (Evolution_CardCursor corba_cursor)
+e_card_cursor_new (GNOME_Evolution_Addressbook_CardCursor corba_cursor)
{
ECardCursor *cursor;
diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h
index b318e646c4..1b5f0d0e0c 100644
--- a/addressbook/backend/ebook/e-card-cursor.h
+++ b/addressbook/backend/ebook/e-card-cursor.h
@@ -31,9 +31,9 @@ struct _ECardCursorClass {
};
/* Creating a new addressbook. */
-ECardCursor *e_card_cursor_new (Evolution_CardCursor corba_cursor);
+ECardCursor *e_card_cursor_new (GNOME_Evolution_Addressbook_CardCursor corba_cursor);
ECardCursor *e_card_cursor_construct (ECardCursor *cursor,
- Evolution_CardCursor corba_cursor);
+ GNOME_Evolution_Addressbook_CardCursor corba_cursor);
GtkType e_card_cursor_get_type (void);
diff --git a/addressbook/backend/idl/addressbook.idl b/addressbook/backend/idl/addressbook.idl
index 95d52e085c..6edfee992d 100644
--- a/addressbook/backend/idl/addressbook.idl
+++ b/addressbook/backend/idl/addressbook.idl
@@ -9,15 +9,16 @@
#include <Bonobo.idl>
+module GNOME {
module Evolution {
-
+module Addressbook {
typedef string CardId;
typedef string VCard;
typedef sequence<VCard> VCardList;
interface CardCursor : Bonobo::Unknown {
- long get_length ();
- string get_nth (in long n);
+ long count ();
+ string getNth (in long n);
};
/*
@@ -29,11 +30,11 @@ module Evolution {
* changes (if it affects the set of viewed cards.)
*/
interface BookViewListener : Bonobo::Unknown {
- void signal_card_added (in VCardList cards);
- void signal_card_removed (in CardId id);
- void signal_card_changed (in VCardList cards);
- void signal_sequence_complete ();
- void signal_status_message (in string message);
+ void notifyCardAdded (in VCardList cards);
+ void notifyCardRemoved (in CardId id);
+ void notifyCardChanged (in VCardList cards);
+ void notifySequenceComplete ();
+ void notifyStatusMessage (in string message);
};
interface BookView : Bonobo::Unknown {
@@ -43,7 +44,7 @@ module Evolution {
/*
* Fetching cards in the addresbook.
*/
- VCard get_vcard (in CardId id);
+ VCard getVCard (in CardId id);
/*
* Permissions. the first form is general write
@@ -54,42 +55,42 @@ module Evolution {
* return FALSE if the user doesn't have permission to
* modify/remove that specific card.
*/
- boolean can_write ();
- boolean can_write_card (in CardId Id);
+ boolean isWriteable ();
+ boolean isCardWriteable (in CardId Id);
/*
* Adding and deleting cards in the book.
*/
- void create_card (in VCard vcard);
- void remove_card (in CardId Id);
+ void addCard (in VCard vcard);
+ void removeCard (in CardId Id);
/*
* Modifying cards in the addressbook.
*/
- void modify_card (in VCard vcard);
+ void modifyCard (in VCard vcard);
/*
- * These two functions return a cursor to the book
+ * This function returns a cursor to the book
* listener. This is for people who want a snapshot
* of the addressbook. The syntax for the query
* string is not yet defined.
*/
- void get_cursor (in string query);
+ void getCursor (in string query);
/*
* These two functions return a book view to the book
* listener. This is for people who want a live view
* of the addressbook.
*/
- void get_book_view(in BookViewListener listener, in string query);
+ void getBookView (in BookViewListener listener, in string query);
- void get_changes(in BookViewListener listener, in string change_id);
+ void getChanges (in BookViewListener listener, in string change_id);
- void check_connection ();
+ void checkConnection ();
- string get_static_capabilities ();
+ string getStaticCapabilities ();
- string get_name ();
+ string getName ();
};
interface BookListener : Bonobo::Unknown {
@@ -103,24 +104,24 @@ module Evolution {
OtherError
};
- void respond_create_card (in CallStatus status, in CardId Id);
+ void notifyCardCreated (in CallStatus status, in CardId Id);
- void respond_remove_card (in CallStatus status);
+ void notifyCardRemoved (in CallStatus status);
- void respond_modify_card (in CallStatus status);
+ void notifyCardModified (in CallStatus status);
- void report_open_book_progress (in string status_message, in short percent);
+ void notifyOpenBookProgress (in string status_message, in short percent);
- void respond_open_book (in CallStatus status, in Book book);
+ void notifyBookOpened (in CallStatus status, in Book book);
- void respond_get_cursor (in CallStatus status, in CardCursor cursor);
+ void notifyCursorRequested (in CallStatus status, in CardCursor cursor);
- void respond_get_view (in CallStatus status, in BookView view);
+ void notifyViewRequested (in CallStatus status, in BookView view);
- void respond_get_changes (in CallStatus status, in BookView view);
+ void notifyChangesRequested (in CallStatus status, in BookView view);
/**
- * report_connection_status:
+ * notifyConnectionStatus:
*
* Used to report changes in the connection to the
* contact repository. This is often a response to a
@@ -128,13 +129,16 @@ module Evolution {
* is free to report the connection status without
* being asked.
*/
- void report_connection_status (in boolean connected);
+ void notifyConnectionStatus (in boolean connected);
};
interface BookFactory : Bonobo::Unknown {
exception ProtocolNotSupported {};
- void open_book (in string uri, in BookListener listener)
+ void openBook (in string uri, in BookListener listener)
raises (ProtocolNotSupported);
};
};
+};
+};
+
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. */
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 5b52b8337b..59737c5b6e 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -90,7 +90,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
static void
owner_unset_cb (EvolutionShellComponent *shell_component,
- Evolution_Shell shell_interface,
+ GNOME_Evolution_Shell shell_interface,
gpointer user_data)
{
owner_count --;
diff --git a/addressbook/gui/component/e-ldap-storage.c b/addressbook/gui/component/e-ldap-storage.c
index 518de69e0d..2dc443140d 100644
--- a/addressbook/gui/component/e-ldap-storage.c
+++ b/addressbook/gui/component/e-ldap-storage.c
@@ -75,7 +75,7 @@ setup_ldap_storage (EvolutionShellComponent *shell_component,
const char *evolution_homedir)
{
EvolutionShellClient *shell_client;
- Evolution_Shell corba_shell;
+ GNOME_Evolution_Shell corba_shell;
shell_client = evolution_shell_component_get_owner (shell_component);
if (shell_client == CORBA_OBJECT_NIL) {
diff --git a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl b/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
index 2bc8154daf..c38d714cf4 100644
--- a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+++ b/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
@@ -10,6 +10,7 @@
#include <Bonobo.idl>
+module GNOME {
module Evolution {
module Addressbook {
@@ -24,14 +25,15 @@ module Addressbook {
exception DuplicateID {};
exception SectionNotFound {};
- void add_section (in string id, in string title)
+ void addSection (in string id, in string title)
raises (DuplicateID);
- Bonobo::Control get_entry_for_section (in string section_id)
+ Bonobo::Control getEntryBySection (in string section_id)
raises (SectionNotFound);
- void activate_dialog (in string section_id);
+ void activateDialog (in string section_id);
};
};
};
+};
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index 7c5d2672b0..b1685f9ef0 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -12,8 +12,8 @@ IDL_GENERATED = \
Evolution-Addressbook-SelectNames-impl.o: Evolution-Addressbook-SelectNames.h
$(IDL_GENERATED): $(IDLS)
- $(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
- -I $(srcdir) $(srcdir)/Evolution-Addressbook-SelectNames.idl
+ $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
+ $(srcdir)/Evolution-Addressbook-SelectNames.idl
oafdir = $(datadir)/oaf
oaf_DATA = evolution-addressbook-select-names.oafinfo
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
index 1a0bd450f0..d6f0e10f05 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c
@@ -98,20 +98,20 @@ entry_set_property_fn (BonoboPropertyBag *bag,
/* CORBA interface implementation. */
-static POA_Evolution_Addressbook_SelectNames__vepv SelectNames_vepv;
+static POA_GNOME_Evolution_Addressbook_SelectNames__vepv SelectNames_vepv;
-static POA_Evolution_Addressbook_SelectNames *
+static POA_GNOME_Evolution_Addressbook_SelectNames *
create_servant (void)
{
- POA_Evolution_Addressbook_SelectNames *servant;
+ POA_GNOME_Evolution_Addressbook_SelectNames *servant;
CORBA_Environment ev;
- servant = (POA_Evolution_Addressbook_SelectNames *) g_new0 (BonoboObjectServant, 1);
+ servant = (POA_GNOME_Evolution_Addressbook_SelectNames *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &SelectNames_vepv;
CORBA_exception_init (&ev);
- POA_Evolution_Addressbook_SelectNames__init ((PortableServer_Servant) servant, &ev);
+ POA_GNOME_Evolution_Addressbook_SelectNames__init ((PortableServer_Servant) servant, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_free (servant);
CORBA_exception_free (&ev);
@@ -162,7 +162,7 @@ impl_SelectNames_get_entry_for_section (PortableServer_Servant servant,
if (entry_widget == NULL) {
CORBA_exception_set (ev,
CORBA_USER_EXCEPTION,
- ex_Evolution_Addressbook_SelectNames_SectionNotFound,
+ ex_GNOME_Evolution_Addressbook_SelectNames_SectionNotFound,
NULL);
return CORBA_OBJECT_NIL;
}
@@ -216,8 +216,8 @@ impl_destroy (GtkObject *object)
static void
corba_class_init ()
{
- POA_Evolution_Addressbook_SelectNames__vepv *vepv;
- POA_Evolution_Addressbook_SelectNames__epv *epv;
+ POA_GNOME_Evolution_Addressbook_SelectNames__vepv *vepv;
+ POA_GNOME_Evolution_Addressbook_SelectNames__epv *epv;
PortableServer_ServantBase__epv *base_epv;
base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -225,14 +225,14 @@ corba_class_init ()
base_epv->finalize = NULL;
base_epv->default_POA = NULL;
- epv = g_new0 (POA_Evolution_Addressbook_SelectNames__epv, 1);
- epv->add_section = impl_SelectNames_add_section;
- epv->get_entry_for_section = impl_SelectNames_get_entry_for_section;
- epv->activate_dialog = impl_SelectNames_activate_dialog;
+ epv = g_new0 (POA_GNOME_Evolution_Addressbook_SelectNames__epv, 1);
+ epv->addSection = impl_SelectNames_add_section;
+ epv->getEntryBySection = impl_SelectNames_get_entry_for_section;
+ epv->activateDialog = impl_SelectNames_activate_dialog;
vepv = &SelectNames_vepv;
vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
- vepv->Evolution_Addressbook_SelectNames_epv = epv;
+ vepv->GNOME_Evolution_Addressbook_SelectNames_epv = epv;
}
static void
@@ -263,7 +263,7 @@ init (ESelectNamesBonobo *select_names)
void
e_select_names_bonobo_construct (ESelectNamesBonobo *select_names,
- Evolution_Addressbook_SelectNames corba_object)
+ GNOME_Evolution_Addressbook_SelectNames corba_object)
{
g_return_if_fail (select_names != NULL);
g_return_if_fail (E_IS_SELECT_NAMES_BONOBO (select_names));
@@ -274,8 +274,8 @@ e_select_names_bonobo_construct (ESelectNamesBonobo *select_names,
ESelectNamesBonobo *
e_select_names_bonobo_new (void)
{
- POA_Evolution_Addressbook_SelectNames *servant;
- Evolution_Addressbook_SelectNames corba_object;
+ POA_GNOME_Evolution_Addressbook_SelectNames *servant;
+ GNOME_Evolution_Addressbook_SelectNames corba_object;
ESelectNamesBonobo *select_names;
servant = create_servant ();
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.h b/addressbook/gui/component/select-names/e-select-names-bonobo.h
index 4531c1e024..87fbfa0fab 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.h
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.h
@@ -61,7 +61,7 @@ struct _ESelectNamesBonoboClass {
GtkType e_select_names_bonobo_get_type (void);
void e_select_names_bonobo_construct (ESelectNamesBonobo *select_names,
- Evolution_Addressbook_SelectNames corba_object);
+ GNOME_Evolution_Addressbook_SelectNames corba_object);
ESelectNamesBonobo *e_select_names_bonobo_new (void);
#ifdef __cplusplus