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
This commit is contained in:
parent
3fb617283b
commit
18e8de9ef6
6 changed files with 18 additions and 7 deletions
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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");
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue