A patch to libgnome to compile with the latest bonobo-conf

[Carlos Perelló Marín <carlos gnome-db org>]

I have use the Bonobo_ConfigDatabase_DEFAULT at
Bonobo_ConfigDatabase_addDatabase, you are free to change it to a better
one.


Could I commit?


Bye

-- 
Carlos Perelló Marín
mailto:carlos gnome-db org
mailto:carlos hispalinux es
http://www.gnome-db.org
http://www.Hispalinux.es
Valencia - Spain

Index: libgnome/gnome-ditem.c
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/gnome-ditem.c,v
retrieving revision 1.44
diff -u -w -r1.44 gnome-ditem.c
--- libgnome/gnome-ditem.c	2001/06/14 14:34:12	1.44
+++ libgnome/gnome-ditem.c	2001/07/02 19:44:49
@@ -152,7 +152,8 @@
 	CORBA_exception_free (&ev);
 
 	CORBA_exception_init (&ev);
-	Bonobo_ConfigDatabase_addDatabase (db, default_db, "", &ev);
+	Bonobo_ConfigDatabase_addDatabase (db, default_db, "",
+					   Bonobo_ConfigDatabase_DEFAULT, &ev);
 	if (BONOBO_EX (&ev)) {
 		g_warning (G_STRLOC ": %s", bonobo_exception_get_text (&ev));
 		bonobo_object_release_unref (db, NULL);
@@ -321,7 +322,9 @@
 		CORBA_exception_free (&ev);
 
 		CORBA_exception_init (&ev);
-		Bonobo_ConfigDatabase_addDatabase (db, item->default_db, "", &ev);
+		Bonobo_ConfigDatabase_addDatabase (db, item->default_db, "",
+						   Bonobo_ConfigDatabase_DEFAULT,
+						   &ev);
 		if (BONOBO_EX (&ev)) {
 			g_warning (G_STRLOC ": %s", bonobo_exception_get_text (&ev));
 			bonobo_object_release_unref (db, NULL);
Index: libgnome/libgnome-init.c
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/libgnome-init.c,v
retrieving revision 1.67
diff -u -w -r1.67 libgnome-init.c
--- libgnome/libgnome-init.c	2001/06/14 14:34:12	1.67
+++ libgnome/libgnome-init.c	2001/07/02 19:44:51
@@ -303,7 +303,9 @@
 	if (priv->config_database != CORBA_OBJECT_NIL) {
 	    CORBA_exception_init (&ev);
 	    Bonobo_ConfigDatabase_addDatabase (priv->config_database, priv->desktop_config_database,
-					       "/Gnome/", &ev);
+					       "/Gnome/",
+					       Bonobo_ConfigDatabase_DEFAULT,
+					       &ev);
 	    CORBA_exception_free (&ev);
 	}
 
Index: monikers/bonobo-moniker-ditem.c
===================================================================
RCS file: /cvs/gnome/libgnome/monikers/bonobo-moniker-ditem.c,v
retrieving revision 1.5
diff -u -w -r1.5 bonobo-moniker-ditem.c
--- monikers/bonobo-moniker-ditem.c	2001/06/28 12:16:24	1.5
+++ monikers/bonobo-moniker-ditem.c	2001/07/02 19:44:51
@@ -66,7 +66,9 @@
 	}
 
 	if (pdb != CORBA_OBJECT_NIL) {
-		Bonobo_ConfigDatabase_addDatabase (db, pdb, "",ev);
+		Bonobo_ConfigDatabase_addDatabase (db, pdb, "",
+						   Bonobo_ConfigDatabase_DEFAULT,
+						   ev);
 		
 		if (BONOBO_EX (ev)) {
 			bonobo_object_release_unref (pdb, NULL);
Index: monikers/test-ditem.c
===================================================================
RCS file: /cvs/gnome/libgnome/monikers/test-ditem.c,v
retrieving revision 1.15
diff -u -w -r1.15 test-ditem.c
--- monikers/test-ditem.c	2001/06/15 22:44:54	1.15
+++ monikers/test-ditem.c	2001/07/02 19:44:51
@@ -103,7 +103,8 @@
 	CORBA_exception_free (&ev);
 
 	CORBA_exception_init (&ev);
-	Bonobo_ConfigDatabase_addDatabase (db, parent_db, "", &ev);
+	Bonobo_ConfigDatabase_addDatabase (db, parent_db, "", 
+					   Bonobo_ConfigDatabase_DEFAULT, &ev);
 	g_assert (!BONOBO_EX (&ev));
 	CORBA_exception_free (&ev);
 }
@@ -150,7 +151,8 @@
 	test_ditem (db);
 
         CORBA_exception_init (&ev);
-	Bonobo_ConfigDatabase_addDatabase (db, default_db, "/gnome-ditem/", &ev);
+	Bonobo_ConfigDatabase_addDatabase (db, default_db, "/gnome-ditem/",
+					   Bonobo_ConfigDatabase_DEFAULT, &ev);
 	g_assert (!BONOBO_EX (&ev));
 
 #if 0