s/BonoboXObject/BonoboObject/

	* folder-info.c: s/BonoboXObject/BonoboObject/

	* mail-config.c: Likewise

	* mail-offline-handler.c: Likewise

svn path=/trunk/; revision=19426

5 files changed, 29 insertions, 21 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index c7955613a4..4a84b7d401 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-13  Dan Winship  <danw@ximian.com>
+
+	* folder-info.c: s/BonoboXObject/BonoboObject/
+
+	* mail-config.c: Likewise
+
+	* mail-offline-handler.c: Likewise
+
 2003-01-13  Not Zed  <NotZed@Ximian.com>
 
 	* mail-mt.c (mail_msg_check_error): hook onto destroy to remove
diff --git a/mail/folder-info.c b/mail/folder-info.c
index 4539eca7ff..47fe547604 100644
--- a/mail/folder-info.c
+++ b/mail/folder-info.c
@@ -14,7 +14,7 @@
 
 #include <glib.h>
 
-#include <bonobo/bonobo-xobject.h>
+#include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-generic-factory.h>
 #include <bonobo/bonobo-property-bag.h>
 #include <bonobo/bonobo-context.h>
@@ -31,7 +31,7 @@
 
 #define FOLDER_INFO_IID "OAFIID:GNOME_Evolution_FolderInfo_Factory"
 
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+#define PARENT_TYPE BONOBO_OBJECT_TYPE
 static BonoboObjectClass *parent_class = NULL;
 
 static GSList *folder_infos;
@@ -40,13 +40,13 @@ typedef struct _EvolutionFolderInfo EvolutionFolderInfo;
 typedef struct _EvolutionFolderInfoClass EvolutionFolderInfoClass;
 
 struct _EvolutionFolderInfo {
-	BonoboXObject parent;
+	BonoboObject parent;
 
 	BonoboPropertyBag *pb;
 };
 
 struct _EvolutionFolderInfoClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 
 	POA_GNOME_Evolution_FolderInfo__epv epv;
 };
@@ -182,10 +182,10 @@ evolution_folder_info_init (EvolutionFolderInfo *info)
 {
 }
 
-BONOBO_X_TYPE_FUNC_FULL (EvolutionFolderInfo,
-			 GNOME_Evolution_FolderInfo,
-			 PARENT_TYPE,
-			 evolution_folder_info);
+BONOBO_TYPE_FUNC_FULL (EvolutionFolderInfo,
+		       GNOME_Evolution_FolderInfo,
+		       PARENT_TYPE,
+		       evolution_folder_info);
 
 enum {
 	PROP_FOLDER_INFO_READY
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 8aa5f1f4f0..c1769bc49b 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -1519,7 +1519,7 @@ mail_config_check_service (const char *url, CamelProviderType type, GList **auth
 }
 
 /* MailConfig Bonobo object */
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+#define PARENT_TYPE BONOBO_OBJECT_TYPE
 static BonoboObjectClass *parent_class = NULL;
 
 /* For the bonobo object */
@@ -1527,11 +1527,11 @@ typedef struct _EvolutionMailConfig EvolutionMailConfig;
 typedef struct _EvolutionMailConfigClass EvolutionMailConfigClass;
 
 struct _EvolutionMailConfig {
-	BonoboXObject parent;
+	BonoboObject parent;
 };
 
 struct _EvolutionMailConfigClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 
 	POA_GNOME_Evolution_MailConfig__epv epv;
 };
@@ -1648,10 +1648,10 @@ evolution_mail_config_init (EvolutionMailConfig *config)
 {
 }
 
-BONOBO_X_TYPE_FUNC_FULL (EvolutionMailConfig,
-			 GNOME_Evolution_MailConfig,
-			 PARENT_TYPE,
-			 evolution_mail_config);
+BONOBO_TYPE_FUNC_FULL (EvolutionMailConfig,
+		       GNOME_Evolution_MailConfig,
+		       PARENT_TYPE,
+		       evolution_mail_config);
 
 static BonoboObject *
 evolution_mail_config_factory_fn (BonoboGenericFactory *factory,
diff --git a/mail/mail-offline-handler.c b/mail/mail-offline-handler.c
index e9387215e4..8249d66a48 100644
--- a/mail/mail-offline-handler.c
+++ b/mail/mail-offline-handler.c
@@ -34,8 +34,8 @@
 
 #include <gal/util/e-util.h>
 
-#define PARENT_TYPE bonobo_x_object_get_type ()
-static BonoboXObjectClass *parent_class = NULL;
+#define PARENT_TYPE bonobo_object_get_type ()
+static BonoboObjectClass *parent_class = NULL;
 
 struct _MailOfflineHandlerPrivate {
 	GHashTable *sync_table;
@@ -350,4 +350,4 @@ mail_offline_handler_new (void)
 	return new;
 }
 
-BONOBO_X_TYPE_FUNC_FULL (MailOfflineHandler, GNOME_Evolution_Offline, PARENT_TYPE, mail_offline_handler);
+BONOBO_TYPE_FUNC_FULL (MailOfflineHandler, GNOME_Evolution_Offline, PARENT_TYPE, mail_offline_handler);
diff --git a/mail/mail-offline-handler.h b/mail/mail-offline-handler.h
index 375f374005..4e6a811d98 100644
--- a/mail/mail-offline-handler.h
+++ b/mail/mail-offline-handler.h
@@ -23,7 +23,7 @@
 #ifndef _MAIL_OFFLINE_HANDLER_H_
 #define _MAIL_OFFLINE_HANDLER_H_
 
-#include <bonobo/bonobo-xobject.h>
+#include <bonobo/bonobo-object.h>
 #include "Evolution.h"
 
 #ifdef __cplusplus
@@ -43,13 +43,13 @@ typedef struct _MailOfflineHandlerPrivate MailOfflineHandlerPrivate;
 typedef struct _MailOfflineHandlerClass   MailOfflineHandlerClass;
 
 struct _MailOfflineHandler {
-	BonoboXObject parent;
+	BonoboObject parent;
 
 	MailOfflineHandlerPrivate *priv;
 };
 
 struct _MailOfflineHandlerClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 
 	POA_GNOME_Evolution_Offline__epv epv;
 };