[monkey-bubble: 422/753] Use bonobo-config, not gnome-config.

[Sven Herzberg <herzi src gnome org>]

commit 08377a44fc77e812c9b1bb4c68134c7d4d05a68d
Author: Martin Baulig <baulig suse de>
Date:   Sun Jun 10 19:50:28 2001 +0000

    Use bonobo-config, not gnome-config.
    
    2001-06-10  Martin Baulig  <baulig suse de>
    
    	* gnome-exec.c (gnome_prepend_terminal_to_vector): Use bonobo-config, not gnome-config.

 libgnome/ChangeLog           |    8 ++++----
 libgnome/gnome-exec.c        |   22 +++++++++++++++++++---
 monikers/gnome-desktop.xmldb |    3 +++
 3 files changed, 26 insertions(+), 7 deletions(-)
---
diff --git a/libgnome/ChangeLog b/libgnome/ChangeLog
index d8842c6..44463c7 100644
--- a/libgnome/ChangeLog
+++ b/libgnome/ChangeLog
@@ -1,11 +1,11 @@
-2001-06-10  Cody Russell  <bratsche gnome org>
-
-	* gnome-preferences: Change preprocessor pasting from ##t## to just ## t.
-
 2001-06-10  Martin Baulig  <baulig suse de>
 
 	* gnome-exec.c (gnome_prepend_terminal_to_vector): Use bonobo-config, not gnome-config.
 
+2001-06-10  Cody Russell  <bratsche gnome org>
+
+	* gnome-preferences: Change preprocessor pasting from ##t## to just ## t.
+
 2001-06-10  Martin Baulig  <baulig suse de>
 
 	* gnome-ditem.c (gnome_ditem_save): Implemented.
diff --git a/libgnome/gnome-exec.c b/libgnome/gnome-exec.c
index 4aa3dd5..469d890 100644
--- a/libgnome/gnome-exec.c
+++ b/libgnome/gnome-exec.c
@@ -27,7 +27,6 @@
 
 #include "gnome-exec.h"
 #include "gnome-util.h"
-#include "gnome-config.h"
 #include "gnome-i18nP.h"
 #include <glib.h>
 
@@ -40,6 +39,12 @@
 #include <string.h>
 #include <signal.h>
 
+#include <libgnome/libgnome-init.h>
+#include <bonobo/bonobo-property-bag-client.h>
+#include <bonobo/bonobo-exception.h>
+
+#include <popt.h>
+
 #include <errno.h>
 #ifndef errno
 extern int errno;
@@ -343,8 +348,12 @@ gnome_prepend_terminal_to_vector (int *argc, char ***argv)
         int real_argc;
         int i, j;
 	char **term_argv = NULL;
+	const char **temp_argv = NULL;
 	int term_argc = 0;
 
+	Bonobo_ConfigDatabase db;
+	gchar *terminal = NULL;
+
 	char **the_argv;
 
         g_return_if_fail (argc != NULL);
@@ -363,8 +372,14 @@ gnome_prepend_terminal_to_vector (int *argc, char ***argv)
 		*argc = i;
 	}
 
-	gnome_config_get_vector ("/Gnome/Applications/Terminal",
-				 &term_argc, &term_argv);
+	db = gnome_get_config_database ();
+	terminal = bonobo_pbclient_get_string (db, "/Gnome/Applications/Terminal", NULL);
+	g_message (G_STRLOC ": |%s|", terminal);
+	if (terminal) {
+	    poptParseArgvString (terminal, &term_argc, &temp_argv);
+	    term_argv = g_strdupv ((gchar **) temp_argv);
+	}
+
 	if (term_argv == NULL) {
 		char *check;
 
@@ -416,6 +431,7 @@ gnome_prepend_terminal_to_vector (int *argc, char ***argv)
 	/* we use g_free here as we sucked all the inner strings
 	 * out from it into real_argv */
 	g_free (term_argv);
+	g_free (terminal);
 }
 
 /**
diff --git a/monikers/gnome-desktop.xmldb b/monikers/gnome-desktop.xmldb
index f86eb85..b5eb4f9 100644
--- a/monikers/gnome-desktop.xmldb
+++ b/monikers/gnome-desktop.xmldb
@@ -3,6 +3,9 @@
   <section path="URL Handlers">
     <entry name="default-show" type="string" value="konqueror"/>
   </section>
+  <section path="/Gnome/Applications">
+    <entry name="Terminal" type="string" value="konsole -e"/>
+  </section>	
   <section path="Foo">
     <entry name="Test" type="long" value="0"/>
   </section>