Updated to reflect new Bonobo names.

svn path=/trunk/; revision=2127

11 files changed, 66 insertions, 60 deletions

diff --git a/addressbook/backend/ebook/.cvsignore b/addressbook/backend/ebook/.cvsignore
new file mode 100644
index 0000000000..09980ae6ba
--- /dev/null
+++ b/addressbook/backend/ebook/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+*.la
diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c
index e1182981fe..3b04a09131 100644
--- a/addressbook/backend/ebook/e-book-listener.c
+++ b/addressbook/backend/ebook/e-book-listener.c
@@ -20,7 +20,7 @@ enum {
 
 static guint e_book_listener_signals [LAST_SIGNAL];
 
-static GnomeObjectClass          *e_book_listener_parent_class;
+static BonoboObjectClass          *e_book_listener_parent_class;
 POA_Evolution_BookListener__vepv  e_book_listener_vepv;
 
 struct _EBookListenerPrivate {
@@ -143,7 +143,7 @@ impl_BookListener_respond_create_card (PortableServer_Servant servant,
 				       const Evolution_BookListener_CallStatus status,
 				       CORBA_Environment *ev)
 {
-	EBookListener *listener = E_BOOK_LISTENER (gnome_object_from_servant (servant));
+	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
 
 	e_book_listener_queue_generic_response (
 		listener, CreateCardResponse,
@@ -155,7 +155,7 @@ impl_BookListener_respond_remove_card (PortableServer_Servant servant,
 				       const Evolution_BookListener_CallStatus status,
 				       CORBA_Environment *ev)
 {
-	EBookListener *listener = E_BOOK_LISTENER (gnome_object_from_servant (servant));
+	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
 
 	e_book_listener_queue_generic_response (
 		listener, RemoveCardResponse,
@@ -167,7 +167,7 @@ impl_BookListener_respond_modify_card (PortableServer_Servant servant,
 				       const Evolution_BookListener_CallStatus status,
 				       CORBA_Environment *ev)
 {
-	EBookListener *listener = E_BOOK_LISTENER (gnome_object_from_servant (servant));
+	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
 
 	e_book_listener_queue_generic_response (
 		listener, ModifyCardResponse,
@@ -180,7 +180,7 @@ impl_BookListener_respond_open_book (PortableServer_Servant servant,
 				     const Evolution_Book book,
 				     CORBA_Environment *ev)
 {
-	EBookListener  *listener = E_BOOK_LISTENER (gnome_object_from_servant (servant));
+	EBookListener  *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
 	Evolution_Book  book_copy;
 
 	book_copy = CORBA_Object_duplicate (book, ev);
@@ -202,7 +202,7 @@ impl_BookListener_report_open_book_progress (PortableServer_Servant servant,
 					     const CORBA_short percent,
 					     CORBA_Environment *ev)
 {
-	EBookListener *listener = E_BOOK_LISTENER (gnome_object_from_servant (servant));
+	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
 
 	e_book_listener_queue_open_progress (
 		listener, status_message, percent);
@@ -213,7 +213,7 @@ impl_BookListener_report_connection_status (PortableServer_Servant servant,
 					    const CORBA_boolean connected,
 					    CORBA_Environment *ev)
 {
-	EBookListener *listener = E_BOOK_LISTENER (gnome_object_from_servant (servant));
+	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
 
 	e_book_listener_queue_link_status (
 		listener, connected);
@@ -224,7 +224,7 @@ impl_BookListener_signal_card_added (PortableServer_Servant servant,
 				     const Evolution_CardId id,
 				     CORBA_Environment *ev)
 {
-	EBookListener *listener = E_BOOK_LISTENER (gnome_object_from_servant (servant));
+	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
 
 	e_book_listener_queue_generic_event (
 		listener, CardAddedEvent, (const char *) id);
@@ -235,7 +235,7 @@ impl_BookListener_signal_card_removed (PortableServer_Servant servant,
 				       const Evolution_CardId id,
 				       CORBA_Environment *ev)
 {
-	EBookListener *listener = E_BOOK_LISTENER (gnome_object_from_servant (servant));
+	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
 
 	e_book_listener_queue_generic_event (
 		listener, CardRemovedEvent, (const char *) id);
@@ -246,7 +246,7 @@ impl_BookListener_signal_card_changed (PortableServer_Servant servant,
 				       const Evolution_CardId id,
 				       CORBA_Environment *ev)
 {
-	EBookListener *listener = E_BOOK_LISTENER (gnome_object_from_servant (servant));
+	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
 
 	e_book_listener_queue_generic_event (
 		listener, CardModifiedEvent, (const char *) id);
@@ -336,7 +336,7 @@ e_book_listener_construct (EBookListener *listener, EBook *book)
 
 	listener->priv->book = book;
 
-	servant = (POA_Evolution_BookListener *) g_new0 (GnomeObjectServant, 1);
+	servant = (POA_Evolution_BookListener *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &e_book_listener_vepv;
 
 	CORBA_exception_init (&ev);
@@ -351,14 +351,14 @@ e_book_listener_construct (EBookListener *listener, EBook *book)
 
 	CORBA_exception_free (&ev);
 
-	obj = gnome_object_activate_servant (GNOME_OBJECT (listener), servant);
+	obj = bonobo_object_activate_servant (BONOBO_OBJECT (listener), servant);
 	if (obj == CORBA_OBJECT_NIL) {
 		g_free (servant);
 
 		return NULL;
 	}
 
-	gnome_object_construct (GNOME_OBJECT (listener), obj);
+	bonobo_object_construct (BONOBO_OBJECT (listener), obj);
 
 	return listener;
 }
@@ -458,7 +458,7 @@ e_book_listener_get_epv (void)
 static void
 e_book_listener_corba_class_init (void)
 {
-	e_book_listener_vepv.GNOME_Unknown_epv          = gnome_object_get_epv ();
+	e_book_listener_vepv.Bonobo_Unknown_epv          = bonobo_object_get_epv ();
 	e_book_listener_vepv.Evolution_BookListener_epv = e_book_listener_get_epv ();
 }
 
@@ -467,7 +467,7 @@ e_book_listener_class_init (EBookListenerClass *klass)
 {
 	GtkObjectClass *object_class = (GtkObjectClass *) klass;
 
-	e_book_listener_parent_class = gtk_type_class (gnome_object_get_type ());
+	e_book_listener_parent_class = gtk_type_class (bonobo_object_get_type ());
 
 	e_book_listener_signals [RESPONSES_QUEUED] =
 		gtk_signal_new ("responses_queued",
@@ -504,7 +504,7 @@ e_book_listener_get_type (void)
 			(GtkClassInitFunc) NULL
 		};
 
-		type = gtk_type_unique (gnome_object_get_type (), &info);
+		type = gtk_type_unique (bonobo_object_get_type (), &info);
 	}
 
 	return type;
diff --git a/addressbook/backend/ebook/e-book-listener.h b/addressbook/backend/ebook/e-book-listener.h
index 9873edc58c..62ff8a3e09 100644
--- a/addressbook/backend/ebook/e-book-listener.h
+++ b/addressbook/backend/ebook/e-book-listener.h
@@ -12,7 +12,7 @@
 #define __E_BOOK_LISTENER_H__
 
 #include <libgnome/gnome-defs.h>
-#include <bonobo/gnome-object.h>
+#include <bonobo/bonobo-object.h>
 #include <e-book.h>
 #include <addressbook.h>
 
@@ -21,12 +21,12 @@ BEGIN_GNOME_DECLS
 typedef struct _EBookListenerPrivate EBookListenerPrivate;
 
 typedef struct {
-	GnomeObject           parent;
+	BonoboObject           parent;
 	EBookListenerPrivate *priv;
 } EBookListener;
 
 typedef struct {
-	GnomeObjectClass parent;
+	BonoboObjectClass parent;
 
 	/*
 	 * Signals
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index 460f73b56e..5777f53f56 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -264,7 +264,7 @@ e_book_load_uri (EBook                     *book,
 
 	Evolution_BookFactory_open_book (
 		book->priv->book_factory, uri,
-		gnome_object_corba_objref (GNOME_OBJECT (book->priv->listener)),
+		bonobo_object_corba_objref (BONOBO_OBJECT (book->priv->listener)),
 		&ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -309,7 +309,7 @@ e_book_unload_uri (EBook *book)
 	 */
 	CORBA_exception_init (&ev);
 
-	GNOME_Unknown_unref  (book->priv->corba_book, &ev);
+	Bonobo_Unknown_unref  (book->priv->corba_book, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_unload_uri: Exception unref'ing "
diff --git a/addressbook/backend/ebook/e-card-types.h b/addressbook/backend/ebook/e-card-types.h
index c148423b21..adf62ad68f 100644
--- a/addressbook/backend/ebook/e-card-types.h
+++ b/addressbook/backend/ebook/e-card-types.h
@@ -193,11 +193,11 @@ typedef struct {
 	char           *region;
 	char           *code;
 	char           *country;
-} ECardAddr;
 
+	char           *description;
+} ECardAddr;
 
-typedef struct 
-{
+typedef struct {
 	ECardAddrFlags  flags;
 	char           *data;
 } ECardAddrLabel;
diff --git a/addressbook/backend/idl/addressbook.idl b/addressbook/backend/idl/addressbook.idl
index eabab4b5c2..2fc4925a21 100644
--- a/addressbook/backend/idl/addressbook.idl
+++ b/addressbook/backend/idl/addressbook.idl
@@ -6,7 +6,7 @@
  * Copyright 2000, Helix Code, Inc.
  */
 
-#include <gnome-unknown.idl>
+#include <bonobo-unknown.idl>
 
 module Evolution {
 
@@ -17,7 +17,7 @@ module Evolution {
 		string get_nth    (in long n);
 	};
 
-	interface Book : GNOME::Unknown {
+	interface Book : Bonobo::Unknown {
 		/*
 		 * Fetching cards in the addresbook.
 		 */
@@ -39,7 +39,7 @@ module Evolution {
 		string get_name ();
 	};
 
-	interface BookListener : GNOME::Unknown {
+	interface BookListener : Bonobo::Unknown {
 
 		enum CallStatus {
 			Success,
@@ -74,7 +74,7 @@ module Evolution {
 		void signal_card_changed (in CardId id);
 	};
 
-	interface BookFactory : GNOME::Unknown {
+	interface BookFactory : Bonobo::Unknown {
 		exception ProtocolNotSupported {};
 
 		void open_book (in string uri, in BookListener listener)
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
index 6f01ed8053..d200cf7114 100644
--- a/addressbook/backend/pas/pas-book-factory.c
+++ b/addressbook/backend/pas/pas-book-factory.c
@@ -13,7 +13,7 @@
 
 #define PAS_BOOK_FACTORY_GOAD_ID "evolution:card-server"
 
-static GnomeObjectClass          *pas_book_factory_parent_class;
+static BonoboObjectClass          *pas_book_factory_parent_class;
 POA_Evolution_BookFactory__vepv   pas_book_factory_vepv;
 
 typedef struct {
@@ -225,7 +225,7 @@ impl_Evolution_BookFactory_open_book (PortableServer_Servant        servant,
 				      CORBA_Environment            *ev)
 {
 	PASBookFactory      *factory =
-		PAS_BOOK_FACTORY (gnome_object_from_servant (servant));
+		PAS_BOOK_FACTORY (bonobo_object_from_servant (servant));
 	PASBackendFactoryFn  backend_factory;
 
 	backend_factory = pas_book_factory_lookup_backend_factory (factory, uri);
@@ -253,7 +253,7 @@ pas_book_factory_construct (PASBookFactory *factory)
 	g_assert (factory != NULL);
 	g_assert (PAS_IS_BOOK_FACTORY (factory));
 
-	servant = (POA_Evolution_BookFactory *) g_new0 (GnomeObjectServant, 1);
+	servant = (POA_Evolution_BookFactory *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &pas_book_factory_vepv;
 
 	CORBA_exception_init (&ev);
@@ -268,14 +268,14 @@ pas_book_factory_construct (PASBookFactory *factory)
 
 	CORBA_exception_free (&ev);
 
-	obj = gnome_object_activate_servant (GNOME_OBJECT (factory), servant);
+	obj = bonobo_object_activate_servant (BONOBO_OBJECT (factory), servant);
 	if (obj == CORBA_OBJECT_NIL) {
 		g_free (servant);
 
 		return FALSE;
 	}
 
-	gnome_object_construct (GNOME_OBJECT (factory), obj);
+	bonobo_object_construct (BONOBO_OBJECT (factory), obj);
 
 	return TRUE;
 }
@@ -316,12 +316,12 @@ pas_book_factory_activate (PASBookFactory *factory)
 
 	ret = goad_server_register (
 		NULL,
-		gnome_object_corba_objref (GNOME_OBJECT (factory)),
+		bonobo_object_corba_objref (BONOBO_OBJECT (factory)),
 		PAS_BOOK_FACTORY_GOAD_ID, "server",
 		&ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("pas_book_factory_construct: Exception "
+		g_message ("pas_book_factory_activate: Exception "
 			   "registering PASBookFactory!\n");
 		CORBA_exception_free (&ev);
 		return;
@@ -330,13 +330,13 @@ pas_book_factory_activate (PASBookFactory *factory)
 	CORBA_exception_free (&ev);
 
 	if (ret == -1) {
-		g_message ("pas_book_factory_construct: Error "
+		g_message ("pas_book_factory_activate: Error "
 			   "registering PASBookFactory!\n");
 		return;
 	}
 
 	if (ret == -2) {
-		g_message ("pas_book_factory_construct: Another "
+		g_message ("pas_book_factory_activate: Another "
 			   "PASBookFactory is already running.\n");
 		return;
 		
@@ -431,7 +431,7 @@ pas_book_factory_get_epv (void)
 static void
 pas_book_factory_corba_class_init (void)
 {
-	pas_book_factory_vepv.GNOME_Unknown_epv         = gnome_object_get_epv ();
+	pas_book_factory_vepv.Bonobo_Unknown_epv         = bonobo_object_get_epv ();
 	pas_book_factory_vepv.Evolution_BookFactory_epv = pas_book_factory_get_epv ();
 }
 
@@ -440,7 +440,7 @@ pas_book_factory_class_init (PASBookFactoryClass *klass)
 {
 	GtkObjectClass *object_class = (GtkObjectClass *) klass;
 
-	pas_book_factory_parent_class = gtk_type_class (gnome_object_get_type ());
+	pas_book_factory_parent_class = gtk_type_class (bonobo_object_get_type ());
 
 	object_class->destroy = pas_book_factory_destroy;
 
@@ -467,7 +467,7 @@ pas_book_factory_get_type (void)
 			(GtkClassInitFunc) NULL
 		};
 
-		type = gtk_type_unique (gnome_object_get_type (), &info);
+		type = gtk_type_unique (bonobo_object_get_type (), &info);
 	}
 
 	return type;
diff --git a/addressbook/backend/pas/pas-book-factory.h b/addressbook/backend/pas/pas-book-factory.h
index 6e72b90062..cd99ae0825 100644
--- a/addressbook/backend/pas/pas-book-factory.h
+++ b/addressbook/backend/pas/pas-book-factory.h
@@ -2,7 +2,7 @@
  * Copyright 2000, Helix Code, Inc.
  */
 
-#include <bonobo/gnome-object.h>
+#include <bonobo/bonobo-object.h>
 #include <libgnome/gnome-defs.h>
 
 #include <pas-backend.h>
@@ -15,12 +15,12 @@ BEGIN_GNOME_DECLS
 typedef struct _PASBookFactoryPrivate PASBookFactoryPrivate;
 
 typedef struct {
-	GnomeObject            parent_object;
+	BonoboObject            parent_object;
 	PASBookFactoryPrivate *priv;
 } PASBookFactory;
 
 typedef struct {
-	GnomeObjectClass parent_class;
+	BonoboObjectClass parent_class;
 } PASBookFactoryClass;
 
 PASBookFactory *pas_book_factory_new              (void);
diff --git a/addressbook/backend/pas/pas-book.c b/addressbook/backend/pas/pas-book.c
index adac2fd806..5428b4ae7c 100644
--- a/addressbook/backend/pas/pas-book.c
+++ b/addressbook/backend/pas/pas-book.c
@@ -7,7 +7,7 @@
 #include <gtk/gtksignal.h>
 #include <pas-book.h>
 
-static GnomeObjectClass *pas_book_parent_class;
+static BonoboObjectClass *pas_book_parent_class;
 POA_Evolution_Book__vepv pas_book_vepv;
 
 enum {
@@ -105,7 +105,7 @@ impl_Evolution_Book_get_vcard (PortableServer_Servant servant,
 			       const Evolution_CardId id,
 			       CORBA_Environment *ev)
 {
-	PASBook    *book = PAS_BOOK (gnome_object_from_servant (servant));
+	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
 	char       *vcard;
 	CORBA_char *retval;
 
@@ -121,7 +121,7 @@ impl_Evolution_Book_create_card (PortableServer_Servant servant,
 				 const CORBA_char *vcard,
 				 CORBA_Environment *ev)
 {
-	PASBook *book = PAS_BOOK (gnome_object_from_servant (servant));
+	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
 
 	pas_book_queue_create_card (book, vcard);
 }
@@ -131,7 +131,7 @@ impl_Evolution_Book_remove_card (PortableServer_Servant servant,
 				 const Evolution_CardId id,
 				 CORBA_Environment *ev)
 {
-	PASBook *book = PAS_BOOK (gnome_object_from_servant (servant));
+	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
 
 	pas_book_queue_remove_card (book, (const char *) id);
 }
@@ -141,7 +141,7 @@ impl_Evolution_Book_modify_card (PortableServer_Servant servant,
 				 const CORBA_char *vcard,
 				 CORBA_Environment *ev)
 {
-	PASBook *book = PAS_BOOK (gnome_object_from_servant (servant));
+	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
 
 	pas_book_queue_modify_card (book, vcard);
 }
@@ -150,7 +150,7 @@ static void
 impl_Evolution_Book_check_connection (PortableServer_Servant servant,
 				      CORBA_Environment *ev)
 {
-	PASBook *book = PAS_BOOK (gnome_object_from_servant (servant));
+	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
 
 	pas_book_queue_check_connection (book);
 }
@@ -231,7 +231,7 @@ pas_book_respond_open (PASBook                           *book,
 	if (status == Evolution_BookListener_Success) {
 		Evolution_BookListener_respond_open_book (
 			book->priv->listener, status,
-			gnome_object_corba_objref (GNOME_OBJECT (book)),
+			bonobo_object_corba_objref (BONOBO_OBJECT (book)),
 			&ev);
 	} else {
 		Evolution_BookListener_respond_open_book (
@@ -415,7 +415,7 @@ pas_book_construct (PASBook                *book,
 	g_assert (listener  != CORBA_OBJECT_NIL);
 	g_assert (get_vcard != NULL);
 
-	servant = (POA_Evolution_Book *) g_new0 (GnomeObjectServant, 1);
+	servant = (POA_Evolution_Book *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &pas_book_vepv;
 
 	CORBA_exception_init (&ev);
@@ -430,14 +430,14 @@ pas_book_construct (PASBook                *book,
 
 	CORBA_exception_free (&ev);
 
-	obj = gnome_object_activate_servant (GNOME_OBJECT (book), servant);
+	obj = bonobo_object_activate_servant (BONOBO_OBJECT (book), servant);
 	if (obj == CORBA_OBJECT_NIL) {
 		g_free (servant);
 
 		return FALSE;
 	}
 
-	gnome_object_construct (GNOME_OBJECT (book), obj);
+	bonobo_object_construct (BONOBO_OBJECT (book), obj);
 
 	book->priv->listener  = listener;
 	book->priv->get_vcard = get_vcard;
@@ -511,7 +511,7 @@ pas_book_get_epv (void)
 static void
 pas_book_corba_class_init (void)
 {
-	pas_book_vepv.GNOME_Unknown_epv  = gnome_object_get_epv ();
+	pas_book_vepv.Bonobo_Unknown_epv  = bonobo_object_get_epv ();
 	pas_book_vepv.Evolution_Book_epv = pas_book_get_epv ();
 }
 
@@ -520,7 +520,7 @@ pas_book_class_init (PASBookClass *klass)
 {
 	GtkObjectClass *object_class = (GtkObjectClass *) klass;
 
-	pas_book_parent_class = gtk_type_class (gnome_object_get_type ());
+	pas_book_parent_class = gtk_type_class (bonobo_object_get_type ());
 
 	pas_book_signals [REQUESTS_QUEUED] =
 		gtk_signal_new ("requests_queued",
@@ -565,7 +565,7 @@ pas_book_get_type (void)
 			(GtkClassInitFunc) NULL
 		};
 
-		type = gtk_type_unique (gnome_object_get_type (), &info);
+		type = gtk_type_unique (bonobo_object_get_type (), &info);
 	}
 
 	return type;
diff --git a/addressbook/backend/pas/pas-book.h b/addressbook/backend/pas/pas-book.h
index e929916ceb..c4763d1654 100644
--- a/addressbook/backend/pas/pas-book.h
+++ b/addressbook/backend/pas/pas-book.h
@@ -11,7 +11,7 @@
 #ifndef __PAS_BOOK_H__
 #define __PAS_BOOK_H__
 
-#include <bonobo/gnome-object.h>
+#include <bonobo/bonobo-object.h>
 #include <libgnome/gnome-defs.h>
 #include <addressbook.h>
 
@@ -34,12 +34,12 @@ typedef struct {
 } PASRequest;
 
 struct _PASBook {
-	GnomeObject     parent_object;
+	BonoboObject     parent_object;
 	PASBookPrivate *priv;
 };
 
 typedef struct {
-	GnomeObjectClass parent_class;
+	BonoboObjectClass parent_class;
 
 	/* Signals */
 	void (*requests_queued) (void);
diff --git a/addressbook/backend/pas/pas.c b/addressbook/backend/pas/pas.c
index 07d6d5c757..f625eb6c2e 100644
--- a/addressbook/backend/pas/pas.c
+++ b/addressbook/backend/pas/pas.c
@@ -5,7 +5,7 @@
  * Copyright 2000, Helix Code, Inc.
  */
 #include <config.h>
-#include <bonobo/gnome-bonobo.h>
+#include <bonobo.h>
 
 #include <pas-book-factory.h>
 #include <pas-backend-file.h>