aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend/pas
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/backend/pas')
-rw-r--r--addressbook/backend/pas/pas-book-factory.c24
-rw-r--r--addressbook/backend/pas/pas-book-factory.h6
-rw-r--r--addressbook/backend/pas/pas-book.c26
-rw-r--r--addressbook/backend/pas/pas-book.h6
-rw-r--r--addressbook/backend/pas/pas.c2
5 files changed, 32 insertions, 32 deletions
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 12:14:27 +0800