[monkey-bubble: 502/753] Now it compile with the latest bonobo-conf

[Sven Herzberg <herzi src gnome org>]

commit e55fabc1355b3c2baf2bd6241e6119153ab7d229
Author: Carlos Perelló Marín <carlos gnome-db org>
Date:   Tue Jul 3 17:55:42 2001 +0000

    Now it compile with the latest bonobo-conf
    
    2001-07-02  Carlos Perelló Marín <carlos gnome-db org>
    
            * gnome-ditem.c, libgnome-init.c: Now it compile with the
            latest bonobo-conf
    
    2001-07-02  Carlos Perelló Marín <carlos gnome-db org>
    
            * bonobo-moniker-ditem.c, test-ditem.c: Now it compile with the
            latest bonobo-conf

 libgnome/ChangeLog     |    5 +++++
 libgnome/gnome-ditem.c |    7 +++++--
 libgnome/gnome-init.c  |    4 +++-
 monikers/ChangeLog     |    5 +++++
 monikers/test-ditem.c  |    6 ++++--
 5 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/libgnome/ChangeLog b/libgnome/ChangeLog
index ac9db68..ff53f81 100644
--- a/libgnome/ChangeLog
+++ b/libgnome/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-02  Carlos Perelló Marín <carlos gnome-db org>
+
+	* gnome-ditem.c, libgnome-init.c: Now it compile with the
+	latest bonobo-conf
+
 Sat Jun 30 15:54:25 2001  Jonathan Blandford  <jrb redhat com>
 
 	* gnome-program.c (gnome_program_initv): Change to match new
diff --git a/libgnome/gnome-ditem.c b/libgnome/gnome-ditem.c
index db57dcd..4680b74 100644
--- a/libgnome/gnome-ditem.c
+++ b/libgnome/gnome-ditem.c
@@ -152,7 +152,8 @@ ditem_load (const char *data_file,
 	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 @@ gnome_desktop_item_save (GnomeDesktopItem *item, const char *under)
 		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);
diff --git a/libgnome/gnome-init.c b/libgnome/gnome-init.c
index 33b3c1c..a34c932 100644
--- a/libgnome/gnome-init.c
+++ b/libgnome/gnome-init.c
@@ -303,7 +303,9 @@ libbonobo_post_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
 	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);
 	}
 
diff --git a/monikers/ChangeLog b/monikers/ChangeLog
index 6fb771e..16f2091 100644
--- a/monikers/ChangeLog
+++ b/monikers/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-02  Carlos Perelló Marín <carlos gnome-db org>
+
+	* bonobo-moniker-ditem.c, test-ditem.c: Now it compile with the 
+	latest bonobo-conf
+
 2001-06-28  Michael Meeks  <michael ximian com>
 
 	* bonobo-config-ditem-utils.c (DECODE_BASIC): fix type usage in
diff --git a/monikers/test-ditem.c b/monikers/test-ditem.c
index 929f221..4826976 100644
--- a/monikers/test-ditem.c
+++ b/monikers/test-ditem.c
@@ -103,7 +103,8 @@ test_builtin (void)
 	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 @@ main (int argc, char **argv)
 	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