GNOME.org
 

[gnome-db] Patch: BonoboXObject to BonoboObject

	Hi there!

	I'm sending a patch that solves bug #67816.

	I already tested the postgres server with the changes applied
	and it works fine.

	Anyone wanna test it too?


Index: libgda/gda-client.c
===================================================================
RCS file: /cvs/gnome/libgda/libgda/gda-client.c,v
retrieving revision 1.10
diff -u -r1.10 gda-client.c
--- libgda/gda-client.c	2002/01/11 16:37:47	1.10
+++ libgda/gda-client.c	2002/01/14 14:00:24
@@ -29,7 +29,7 @@
 #include <bonobo/bonobo-moniker-util.h>
 #include "gda-marshal.h"
 
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+#define PARENT_TYPE BONOBO_OBJECT_TYPE
 
 struct _GdaClientPrivate {
 	GHashTable *providers;
@@ -160,7 +160,7 @@
 	parent_class->finalize (object);
 }
 
-BONOBO_X_TYPE_FUNC_FULL (GdaClient,
+BONOBO_TYPE_FUNC_FULL (GdaClient,
 			 GNOME_Database_Client,
 			 PARENT_TYPE,
 			 gda_client)
Index: libgda/gda-client.h
===================================================================
RCS file: /cvs/gnome/libgda/libgda/gda-client.h,v
retrieving revision 1.7
diff -u -r1.7 gda-client.h
--- libgda/gda-client.h	2002/01/11 16:37:47	1.7
+++ libgda/gda-client.h	2002/01/14 14:00:24
@@ -40,12 +40,12 @@
 typedef struct _GdaClientPrivate GdaClientPrivate;
 
 struct _GdaClient {
-	BonoboXObject object;
+	BonoboObject object;
 	GdaClientPrivate *priv;
 };
 
 struct _GdaClientClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 	POA_GNOME_Database_Client__epv epv;
 
 	/* signals */
Index: libgda/gda-server-connection.c
===================================================================
RCS file: /cvs/gnome/libgda/libgda/gda-server-connection.c,v
retrieving revision 1.17
diff -u -r1.17 gda-server-connection.c
--- libgda/gda-server-connection.c	2002/01/13 23:52:03	1.17
+++ libgda/gda-server-connection.c	2002/01/14 14:00:24
@@ -27,7 +27,7 @@
 #include <bonobo/bonobo-i18n.h>
 #include <bonobo/bonobo-exception.h>
 
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+#define PARENT_TYPE BONOBO_OBJECT_TYPE
 
 struct _GdaServerConnectionPrivate {
 	GdaServerProvider *provider;
@@ -61,7 +61,7 @@
 	gboolean result;
 	GdaQuarkList *params;
 	GNOME_Database_Client client_copy;
-	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_x_object (servant);
+	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_CONNECTION (cnc), FALSE, ev);
 
@@ -106,7 +106,7 @@
 {
 	gboolean result;
 	GList *l;
-	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_x_object (servant);
+	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_CONNECTION (cnc), FALSE, ev);
 
@@ -150,7 +150,7 @@
 	gint count;
 	GNOME_Database_RecordsetList *seq;
 	GdaParameterList *param_list = NULL;
-	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_x_object (servant);
+	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_CONNECTION (cnc), NULL, ev);
 
@@ -185,7 +185,7 @@
 				  CORBA_Environment *ev)
 {
 	gboolean result;
-	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_x_object (servant);
+	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_CONNECTION (cnc), FALSE, ev);
 
@@ -210,7 +210,7 @@
 				   CORBA_Environment *ev)
 {
 	gboolean result;
-	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_x_object (servant);
+	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_CONNECTION (cnc), FALSE, ev);
 
@@ -234,7 +234,7 @@
 				     CORBA_Environment *ev)
 {
 	gboolean result;
-	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_x_object (servant);
+	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_CONNECTION (cnc), FALSE, ev);
 
@@ -258,7 +258,7 @@
 			  CORBA_Environment *ev)
 {
 	gboolean result;
-	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_x_object (servant);
+	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_CONNECTION (cnc), FALSE, ev);
 
@@ -274,7 +274,7 @@
 {
 	GdaServerRecordset *recset;
 	GdaParameterList *plist;
-	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_x_object (servant);
+	GdaServerConnection *cnc = (GdaServerConnection *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_CONNECTION (cnc), CORBA_OBJECT_NIL, ev);
 
@@ -361,7 +361,7 @@
 	parent_class->finalize (object);
 }
 
-BONOBO_X_TYPE_FUNC_FULL (GdaServerConnection,
+BONOBO_TYPE_FUNC_FULL (GdaServerConnection,
 			 GNOME_Database_Connection,
 			 PARENT_TYPE,
 			 gda_server_connection)
Index: libgda/gda-server-connection.h
===================================================================
RCS file: /cvs/gnome/libgda/libgda/gda-server-connection.h,v
retrieving revision 1.4
diff -u -r1.4 gda-server-connection.h
--- libgda/gda-server-connection.h	2002/01/11 16:37:48	1.4
+++ libgda/gda-server-connection.h	2002/01/14 14:00:24
@@ -43,12 +43,12 @@
 typedef struct _GdaServerProvider          GdaServerProvider;
 
 struct _GdaServerConnection {
-	BonoboXObject object;
+	BonoboObject object;
 	GdaServerConnectionPrivate *priv;
 };
 
 struct _GdaServerConnectionClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 	POA_GNOME_Database_Connection__epv epv;
 };
 
Index: libgda/gda-server-provider.c
===================================================================
RCS file: /cvs/gnome/libgda/libgda/gda-server-provider.c,v
retrieving revision 1.11
diff -u -r1.11 gda-server-provider.c
--- libgda/gda-server-provider.c	2002/01/14 02:00:35	1.11
+++ libgda/gda-server-provider.c	2002/01/14 14:00:24
@@ -24,7 +24,7 @@
 #include <bonobo/bonobo-exception.h>
 #include <libgda/gda-server-provider.h>
 
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+#define PARENT_TYPE BONOBO_OBJECT_TYPE
 #define CLASS(provider) (GDA_SERVER_PROVIDER_CLASS (G_OBJECT_GET_CLASS (provider)))
 
 struct _GdaServerProviderPrivate {
@@ -52,7 +52,7 @@
 impl_Provider_createConnection (PortableServer_Servant servant, CORBA_Environment *ev)
 {
 	GdaServerConnection *cnc;
-	GdaServerProvider *provider = (GdaServerProvider *) bonobo_x_object (servant);
+	GdaServerProvider *provider = (GdaServerProvider *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_PROVIDER (provider), CORBA_OBJECT_NIL, ev);
 
@@ -118,7 +118,7 @@
 	parent_class->finalize (object);
 }
 
-BONOBO_X_TYPE_FUNC_FULL (GdaServerProvider,
+BONOBO_TYPE_FUNC_FULL (GdaServerProvider,
 			 GNOME_Database_Provider,
 			 PARENT_TYPE,
 			 gda_server_provider)
Index: libgda/gda-server-provider.h
===================================================================
RCS file: /cvs/gnome/libgda/libgda/gda-server-provider.h,v
retrieving revision 1.7
diff -u -r1.7 gda-server-provider.h
--- libgda/gda-server-provider.h	2002/01/11 16:37:48	1.7
+++ libgda/gda-server-provider.h	2002/01/14 14:00:24
@@ -41,12 +41,12 @@
 typedef struct _GdaServerProviderPrivate GdaServerProviderPrivate;
 
 struct _GdaServerProvider {
-	BonoboXObject object;
+	BonoboObject object;
 	GdaServerProviderPrivate *priv;
 };
 
 struct _GdaServerProviderClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 	POA_GNOME_Database_Provider__epv epv;
 
 	/* signals */
Index: libgda/gda-server-recordset.c
===================================================================
RCS file: /cvs/gnome/libgda/libgda/gda-server-recordset.c,v
retrieving revision 1.11
diff -u -r1.11 gda-server-recordset.c
--- libgda/gda-server-recordset.c	2002/01/11 16:37:48	1.11
+++ libgda/gda-server-recordset.c	2002/01/14 14:00:24
@@ -24,7 +24,7 @@
 #include <bonobo/bonobo-i18n.h>
 #include <libgda/gda-server-recordset.h>
 
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+#define PARENT_TYPE BONOBO_OBJECT_TYPE
 
 struct _GdaServerRecordsetPrivate {
 	GdaServerConnection *cnc;
@@ -95,7 +95,7 @@
 impl_Recordset_describe (PortableServer_Servant servant, CORBA_Environment *ev)
 {
 	GdaRowAttributes *attrs;
-	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_x_object (servant);
+	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_RECORDSET (recset), NULL, ev);
 
@@ -113,7 +113,7 @@
 {
 	glong i;
 	GdaRow *row;
-	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_x_object (servant);
+	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_RECORDSET (recset), 0, ev);
 
@@ -134,7 +134,7 @@
 static CORBA_boolean
 impl_Recordset_moveFirst (PortableServer_Servant servant, CORBA_Environment *ev)
 {
-	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_x_object (servant);
+	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_RECORDSET (recset), FALSE, ev);
 
@@ -145,7 +145,7 @@
 static CORBA_boolean
 impl_Recordset_moveNext (PortableServer_Servant servant, CORBA_Environment *ev)
 {
-	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_x_object (servant);
+	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_RECORDSET (recset), FALSE, ev);
 
@@ -160,7 +160,7 @@
 static CORBA_boolean
 impl_Recordset_movePrevious (PortableServer_Servant servant, CORBA_Environment *ev)
 {
-	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_x_object (servant);
+	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_RECORDSET (recset), FALSE, ev);
 
@@ -175,7 +175,7 @@
 static CORBA_boolean
 impl_Recordset_moveLast (PortableServer_Servant servant, CORBA_Environment *ev)
 {
-	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_x_object (servant);
+	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_RECORDSET (recset), FALSE, ev);
 
@@ -189,7 +189,7 @@
 impl_Recordset_fetch (PortableServer_Servant servant, CORBA_Environment *ev)
 {
 	GdaRow *row;
-	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_x_object (servant);
+	GdaServerRecordset *recset = (GdaServerRecordset *) bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_SERVER_RECORDSET (recset), NULL, ev);
 
@@ -274,7 +274,7 @@
 	parent_class->finalize (object);
 }
 
-BONOBO_X_TYPE_FUNC_FULL (GdaServerRecordset,
+BONOBO_TYPE_FUNC_FULL (GdaServerRecordset,
 			 GNOME_Database_Recordset,
 			 PARENT_TYPE,
 			 gda_server_recordset)
Index: libgda/gda-server-recordset.h
===================================================================
RCS file: /cvs/gnome/libgda/libgda/gda-server-recordset.h,v
retrieving revision 1.7
diff -u -r1.7 gda-server-recordset.h
--- libgda/gda-server-recordset.h	2002/01/11 16:37:48	1.7
+++ libgda/gda-server-recordset.h	2002/01/14 14:00:24
@@ -40,12 +40,12 @@
 typedef struct _GdaServerRecordsetPrivate GdaServerRecordsetPrivate;
 
 struct _GdaServerRecordset {
-	BonoboXObject object;
+	BonoboObject object;
 	GdaServerRecordsetPrivate *priv;
 };
 
 struct _GdaServerRecordsetClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 	POA_GNOME_Database_Recordset__epv epv;
 };
 
Index: report/gda-report-engine.c
===================================================================
RCS file: /cvs/gnome/libgda/report/gda-report-engine.c,v
retrieving revision 1.19
diff -u -r1.19 gda-report-engine.c
--- report/gda-report-engine.c	2002/01/11 16:53:47	1.19
+++ report/gda-report-engine.c	2002/01/14 14:00:24
@@ -25,7 +25,7 @@
 #include <bonobo/bonobo-i18n.h>
 #include "gda-report-engine.h"
 
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+#define PARENT_TYPE BONOBO_OBJECT_TYPE
 
 struct _GdaReportEnginePrivate {
 };
@@ -51,7 +51,7 @@
 	gchar *body;
 	GNOME_Database_Report_Output output;
 	GdaParameterList *plist;
-	GdaReportEngine *engine = bonobo_x_object (servant);
+	GdaReportEngine *engine = bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_REPORT_ENGINE (engine), CORBA_OBJECT_NIL, ev);
 	bonobo_return_val_if_fail (xml != CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, ev);
@@ -127,7 +127,7 @@
 	parent_class->finalize (object);
 }
 
-BONOBO_X_TYPE_FUNC_FULL (GdaReportEngine,
+BONOBO_TYPE_FUNC_FULL (GdaReportEngine,
 			 GNOME_Database_Report_Engine,
 			 PARENT_TYPE,
 			 gda_report_engine)
Index: report/gda-report-engine.h
===================================================================
RCS file: /cvs/gnome/libgda/report/gda-report-engine.h,v
retrieving revision 1.14
diff -u -r1.14 gda-report-engine.h
--- report/gda-report-engine.h	2002/01/11 16:53:47	1.14
+++ report/gda-report-engine.h	2002/01/14 14:00:24
@@ -41,12 +41,12 @@
 typedef struct _GdaReportEnginePrivate GdaReportEnginePrivate;
 
 struct _GdaReportEngine {
-	BonoboXObject object;
+	BonoboObject object;
 	GdaReportEnginePrivate *priv;
 };
 
 struct _GdaReportEngineClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 	POA_GNOME_Database_Report_Engine__epv epv;
 };
 
Index: report/gda-report-output.c
===================================================================
RCS file: /cvs/gnome/libgda/report/gda-report-output.c,v
retrieving revision 1.2
diff -u -r1.2 gda-report-output.c
--- report/gda-report-output.c	2002/01/11 16:53:47	1.2
+++ report/gda-report-output.c	2002/01/14 14:00:24
@@ -23,7 +23,7 @@
 #include <bonobo/bonobo-exception.h>
 #include "gda-report-output.h"
 
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+#define PARENT_TYPE BONOBO_OBJECT_TYPE
 
 struct _GdaReportOutputPrivate {
 	GdaReportDocument *input_xml;
@@ -45,7 +45,7 @@
 			   const CORBA_char *mime_type,
 			   CORBA_Environment *ev)
 {
-	GdaReportOutput *output = bonobo_x_object (servant);
+	GdaReportOutput *output = bonobo_object (servant);
 
 	bonobo_return_val_if_fail (GDA_IS_REPORT_OUTPUT (output), CORBA_OBJECT_NIL, ev);
 }
@@ -99,7 +99,7 @@
 	parent_class->finalize (object);
 }
 
-BONOBO_X_TYPE_FUNC_FULL (GdaReportOutput,
+BONOBO_TYPE_FUNC_FULL (GdaReportOutput,
 			 GNOME_Database_Report_Output,
 			 PARENT_TYPE,
 			 gda_report_output)
Index: report/gda-report-output.h
===================================================================
RCS file: /cvs/gnome/libgda/report/gda-report-output.h,v
retrieving revision 1.6
diff -u -r1.6 gda-report-output.h
--- report/gda-report-output.h	2002/01/11 16:53:47	1.6
+++ report/gda-report-output.h	2002/01/14 14:00:24
@@ -38,12 +38,12 @@
 typedef struct _GdaReportOutputPrivate GdaReportOutputPrivate;
 
 struct _GdaReportOutput {
-	BonoboXObject object;
+	BonoboObject object;
 	GdaReportOutputPrivate *priv;
 };
 
 struct _GdaReportOutputClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 	POA_GNOME_Database_Report_Output__epv epv;
 };
 
Index: report/libgda-report/gda-report-datasource.c
===================================================================
RCS file: /cvs/gnome/libgda/report/libgda-report/gda-report-datasource.c,v
retrieving revision 1.3
diff -u -r1.3 gda-report-datasource.c
--- report/libgda-report/gda-report-datasource.c	2002/01/11 16:53:48	1.3
+++ report/libgda-report/gda-report-datasource.c	2002/01/14 14:00:24
@@ -22,7 +22,7 @@
 
 #include <libgda-report/gda-report-datasource.h>
 
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+#define PARENT_TYPE BONOBO_OBJECT_TYPE
 
 static void gda_report_datasource_class_init (GdaReportDatasourceClass *klass);
 static void gda_report_datasource_init       (GdaReportDatasource *source,
Index: report/libgda-report/gda-report-datasource.h
===================================================================
RCS file: /cvs/gnome/libgda/report/libgda-report/gda-report-datasource.h,v
retrieving revision 1.3
diff -u -r1.3 gda-report-datasource.h
--- report/libgda-report/gda-report-datasource.h	2002/01/11 16:53:48	1.3
+++ report/libgda-report/gda-report-datasource.h	2002/01/14 14:00:24
@@ -39,12 +39,12 @@
 typedef struct _GdaReportDatasourcePrivate GdaReportDatasourcePrivate;
 
 struct _GdaReportDatasource {
-	BonoboXObject object;
+	BonoboObject object;
 	GdaReportDatasourcePrivate *priv;
 };
 
 struct _GdaReportDatasourceClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 	POA_GNOME_Database_Report_DataSource__epv epv;
 };
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]