diff options
Diffstat (limited to 'addressbook/backend/ebook')
| -rw-r--r-- | addressbook/backend/ebook/Makefile.am | 2 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-listener.c | 90 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-listener.h | 8 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-view-listener.c | 44 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-view-listener.h | 2 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-view.c | 10 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-view.h | 2 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book.c | 54 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-card-cursor.c | 22 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-card-cursor.h | 4 |
10 files changed, 119 insertions, 119 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); |