[gnome-db] Patch for gnome-db. Closes bug #67815

[Gonzalo Paniagua Javier <gonzalo gnome-db org>]

	Just what the subject says. I've done the same changes as for
	libgda.

	Bye!


-- 
Gonzalo Paniagua Javier <gonzalo gnome-db org>
http://www.gnome-db.org/~gonzalo/

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-db/ChangeLog,v
retrieving revision 1.85
diff -u -r1.85 ChangeLog
--- ChangeLog	2002/01/27 00:25:11	1.85
+++ ChangeLog	2002/01/28 14:43:48
@@ -1,3 +1,9 @@
+2002-01-28  Gonzalo Paniagua Javier <gonzalo gnome-db org>
+
+	* lib/gnome-db-shell-component.[ch]:
+	* lib/gnome-db-shell.[ch]: replaced BonoboXObject with BonoboObject.
+	Closes bug #67815.
+
 2002-01-27  Rodrigo Moya <rodrigo gnome-db org>
 
 	* components/manager/components-manager-view.c: added a configuration
Index: lib/gnome-db-shell-component.c
===================================================================
RCS file: /cvs/gnome/gnome-db/lib/gnome-db-shell-component.c,v
retrieving revision 1.6
diff -u -r1.6 gnome-db-shell-component.c
--- lib/gnome-db-shell-component.c	2002/01/13 22:41:24	1.6
+++ lib/gnome-db-shell-component.c	2002/01/28 14:43:48
@@ -26,7 +26,7 @@
 #include <bonobo/bonobo-i18n.h>
 #include "gnome-db-shell-component.h"
 
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+#define PARENT_TYPE BONOBO_OBJECT_TYPE
 #define CLASS(comp) (GNOME_DB_SHELL_COMPONENT_CLASS (G_OBJECT_GET_CLASS (comp)))
 
 static void gnome_db_shell_component_class_init (GnomeDbShellComponentClass *klass);
@@ -74,7 +74,7 @@
 {
 	GNOME_Database_UIShell shell_copy;
 	CORBA_Environment ev2;
-	GnomeDbShellComponent *comp = (GnomeDbShellComponent *) bonobo_x_object (servant);
+	GnomeDbShellComponent *comp = (GnomeDbShellComponent *) bonobo_object (servant);
 
 	g_return_if_fail (GNOME_DB_IS_SHELL_COMPONENT (comp));
 
@@ -98,7 +98,7 @@
 					const CORBA_char *password,
 					CORBA_Environment *ev)
 {
-	GnomeDbShellComponent *comp = (GnomeDbShellComponent *) bonobo_x_object (servant);
+	GnomeDbShellComponent *comp = (GnomeDbShellComponent *) bonobo_object (servant);
 
 	g_return_val_if_fail (GNOME_DB_IS_SHELL_COMPONENT (comp), FALSE);
 
@@ -157,7 +157,7 @@
 	parent_class->finalize (object);
 }
 
-BONOBO_X_TYPE_FUNC_FULL (GnomeDbShellComponent,
+BONOBO_TYPE_FUNC_FULL (GnomeDbShellComponent,
 			 GNOME_Database_UIShellComponent,
 			 PARENT_TYPE,
 			 gnome_db_shell_component)
Index: lib/gnome-db-shell-component.h
===================================================================
RCS file: /cvs/gnome/gnome-db/lib/gnome-db-shell-component.h,v
retrieving revision 1.10
diff -u -r1.10 gnome-db-shell-component.h
--- lib/gnome-db-shell-component.h	2002/01/13 22:41:24	1.10
+++ lib/gnome-db-shell-component.h	2002/01/28 14:43:48
@@ -23,7 +23,7 @@
 #if !defined(__gnome_db_shell_component_h__)
 #  define __gnome_db_shell_component_h__
 
-#include <bonobo/bonobo-xobject.h>
+#include <bonobo/bonobo-object.h>
 #include <libgnomedb/gnome-db-control.h>
 #include <GNOME_Database_UI.h>
 
@@ -40,12 +40,12 @@
 typedef struct _GnomeDbShellComponentPrivate GnomeDbShellComponentPrivate;
 
 struct _GnomeDbShellComponent {
-	BonoboXObject object;
+	BonoboObject object;
 	GnomeDbShellComponentPrivate* priv;
 };
 
 struct _GnomeDbShellComponentClass {
-	BonoboXObjectClass parent_class; 
+	BonoboObjectClass parent_class; 
 
 	POA_GNOME_Database_UIShellComponent__epv epv;
 
Index: lib/gnome-db-shell.c
===================================================================
RCS file: /cvs/gnome/gnome-db/lib/gnome-db-shell.c,v
retrieving revision 1.29
diff -u -r1.29 gnome-db-shell.c
--- lib/gnome-db-shell.c	2002/01/26 16:18:33	1.29
+++ lib/gnome-db-shell.c	2002/01/28 14:43:48
@@ -38,7 +38,7 @@
 #include "gnome-db-shortcut.h"
 #include "gnome-db-summary.h"
 
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+#define PARENT_TYPE BONOBO_OBJECT_TYPE
 
 struct _GnomeDbShellPrivate {
 	GtkWidget *window;
@@ -399,7 +399,7 @@
 				     const CORBA_char *username,
 				     const CORBA_char *password)
 {
-	GnomeDbShell *shell = (GnomeDbShell *) bonobo_x_object (servant);
+	GnomeDbShell *shell = (GnomeDbShell *) bonobo_object (servant);
 
 	g_return_if_fail (GNOME_DB_IS_SHELL (shell));
 }
@@ -410,7 +410,7 @@
 				     const CORBA_char *username,
 				     const CORBA_char *password)
 {
-	GnomeDbShell *shell = (GnomeDbShell *) bonobo_x_object (servant);
+	GnomeDbShell *shell = (GnomeDbShell *) bonobo_object (servant);
 
 	g_return_if_fail (GNOME_DB_IS_SHELL (shell));
 }
@@ -472,7 +472,7 @@
 	parent_class->finalize (object);
 }
 
-BONOBO_X_TYPE_FUNC_FULL (GnomeDbShell,
+BONOBO_TYPE_FUNC_FULL (GnomeDbShell,
 			 GNOME_Database_UIShell,
 			 PARENT_TYPE,
 			 gnome_db_shell)
Index: lib/gnome-db-shell.h
===================================================================
RCS file: /cvs/gnome/gnome-db/lib/gnome-db-shell.h,v
retrieving revision 1.6
diff -u -r1.6 gnome-db-shell.h
--- lib/gnome-db-shell.h	2002/01/13 22:41:24	1.6
+++ lib/gnome-db-shell.h	2002/01/28 14:43:48
@@ -23,7 +23,7 @@
 #if !defined(__gnome_db_shell_h__)
 #  define __gnome_db_shell_h__
 
-#include <bonobo/bonobo-xobject.h>
+#include <bonobo/bonobo-object.h>
 #include <gtk/gtkwidget.h>
 #include <GNOME_Database_UI.h>
 
@@ -43,12 +43,12 @@
 typedef struct _GnomeDbShellPrivate GnomeDbShellPrivate;
 
 struct _GnomeDbShell {
-	BonoboXObject object;
+	BonoboObject object;
 	GnomeDbShellPrivate *priv;
 };
 
 struct _GnomeDbShellClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 
 	POA_GNOME_Database_UIShell__epv epv;
 };