From 18e8de9ef65face699fb9fd1773554ed3af5f4eb Mon Sep 17 00:00:00 2001
From: Bradford Hovinen <hovinen@ximian.com>
Date: Tue, 10 Jul 2001 14:00:15 +0000
Subject: [PATCH] Don't accept PropertyBag interface

2001-07-10  Bradford Hovinen  <hovinen@ximian.com>

	* bonobo-moniker-archiver.c (archiver_resolve): Don't accept
	PropertyBag interface

	* sound-properties-capplet.c (set_moniker_cb): Make full moniker

	* sound-properties.xml: Fixed path name
---
 archiver/ChangeLog                        | 5 +++++
 archiver/bonobo-config-archiver.c         | 2 +-
 archiver/bonobo-moniker-archiver.c        | 6 ++----
 capplets/sound/ChangeLog                  | 6 ++++++
 capplets/sound/sound-properties-capplet.c | 4 +++-
 capplets/sound/sound-properties.xml       | 2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/archiver/ChangeLog b/archiver/ChangeLog
index f69febd89..f8408480c 100644
--- a/archiver/ChangeLog
+++ b/archiver/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-10  Bradford Hovinen  <hovinen@ximian.com>
+
+	* bonobo-moniker-archiver.c (archiver_resolve): Don't accept
+	PropertyBag interface
+
 2001-07-09  Bradford Hovinen  <hovinen@ximian.com>
 
 	* bonobo-config-archiver.c (bonobo_config_archiver_new): Use
diff --git a/archiver/bonobo-config-archiver.c b/archiver/bonobo-config-archiver.c
index 0baac12a3..607a36c9d 100644
--- a/archiver/bonobo-config-archiver.c
+++ b/archiver/bonobo-config-archiver.c
@@ -378,7 +378,7 @@ real_list_keys (BonoboConfigDatabase *db,
 	
 	for (l = dd->entries; l != NULL; l = l->next) {
 		de = (DirEntry *)l->data;
-	       
+
                 key_list->_buffer [key_list->_length] = 
                         CORBA_string_dup (de->name);
                 key_list->_length++;
diff --git a/archiver/bonobo-moniker-archiver.c b/archiver/bonobo-moniker-archiver.c
index 1957e1e5d..422a705ab 100644
--- a/archiver/bonobo-moniker-archiver.c
+++ b/archiver/bonobo-moniker-archiver.c
@@ -63,9 +63,7 @@ archiver_resolve (BonoboMoniker               *moniker,
 	const gchar           *name;
 	gchar                 *backend_id, *location;
 
-	if (strcmp (requested_interface, "IDL:Bonobo/ConfigDatabase:1.0") &&
-	    strcmp (requested_interface, "IDL:Bonobo/PropertyBag:1.0"))
-	{
+	if (strcmp (requested_interface, "IDL:Bonobo/ConfigDatabase:1.0")) {
 		EX_SET_NOT_FOUND (ev);
 		return CORBA_OBJECT_NIL; 
 	}
@@ -79,7 +77,7 @@ archiver_resolve (BonoboMoniker               *moniker,
 
 	if (parent != CORBA_OBJECT_NIL) {
 		pdb = Bonobo_Moniker_resolve (parent, options, 
-					      requested_interface, ev);
+					      "IDL:Bonobo/ConfigDatabase:1.0", ev);
     
 		bonobo_object_release_unref (parent, NULL);
 		
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index da1c69066..20d70991e 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-10  Bradford Hovinen  <hovinen@ximian.com>
+
+	* sound-properties-capplet.c (set_moniker_cb): Make full moniker
+
+	* sound-properties.xml: Fixed path name
+
 2001-07-09  Bradford Hovinen  <hovinen@ximian.com>
 
 	* sound-properties.xml: Use 0 and 1 rather than true and false
diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c
index 68bbfc87c..f8077df78 100644
--- a/capplets/sound/sound-properties-capplet.c
+++ b/capplets/sound/sound-properties-capplet.c
@@ -148,6 +148,7 @@ set_moniker_cb (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id,
 		CORBA_Environment *ev, BonoboControl *control) 
 {
 	gchar *moniker;
+	gchar *full_moniker;
 	BonoboPEditor *ed;
 	BonoboPropertyFrame *pf;
 	Bonobo_PropertyBag proxy;
@@ -156,9 +157,10 @@ set_moniker_cb (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id,
 	if (arg_id != 1) return;
 
 	moniker = BONOBO_ARG_GET_STRING (arg);
+	full_moniker = g_strconcat (moniker, "#config:/main", NULL);
 
 	pf = BONOBO_PROPERTY_FRAME (bonobo_control_get_widget (control));
-	bonobo_property_frame_set_moniker (pf, moniker);
+	bonobo_property_frame_set_moniker (pf, full_moniker);
 	proxy = BONOBO_OBJREF (pf->proxy);
 	dialog = gtk_object_get_data (GTK_OBJECT (control), "dialog");
 
diff --git a/capplets/sound/sound-properties.xml b/capplets/sound/sound-properties.xml
index 67b8bcbf9..b66836b76 100644
--- a/capplets/sound/sound-properties.xml
+++ b/capplets/sound/sound-properties.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <bonobo-config>
-  <section path="bonobo-conf-test">
+  <section path="main">
     <entry name="start_esd" type="boolean" value="0"/>
     <entry name="event_sounds" type="boolean" value="1"/>
   </section>