applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add sound-properties

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

        * default-user.xml: Add sound-properties

        * sound-properties-capplet.c (get_legacy_settings): Sync database
This commit is contained in:
Bradford Hovinen 2001-07-11 02:22:46 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent e10800015f
commit 3395c90a5d
7 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
archiver/ChangeLog
View file

@ -1,5 +1,7 @@
2001-07-10 Bradford Hovinen <hovinen@ximian.com> 2001-07-10 Bradford Hovinen <hovinen@ximian.com>
* default-user.xml: Add sound-properties
* bonobo-moniker-archiver.c (archiver_resolve): Don't accept * bonobo-moniker-archiver.c (archiver_resolve): Don't accept
PropertyBag interface PropertyBag interface

2
archiver/Makefile.am
View file

@ -1,7 +1,7 @@
confexecdir = $(libdir) confexecdir = $(libdir)
confexec_DATA = config_archiverConf.sh confexec_DATA = config_archiverConf.sh
Locationmetadir = $(datadir)/control-center-data/archiver Locationmetadir = $(datadir)/control-center/archiver
Locationmeta_DATA = default-user.xml default-global.xml Locationmeta_DATA = default-user.xml default-global.xml
includedir = $(prefix)/include/config-archiver includedir = $(prefix)/include/config-archiver

3
archiver/bonobo-config-archiver.c
View file

@ -532,6 +532,9 @@ static void
bonobo_config_archiver_init (BonoboConfigArchiver *archiver_db) bonobo_config_archiver_init (BonoboConfigArchiver *archiver_db)
{ {
archiver_db->dir = g_new0 (DirData, 1); archiver_db->dir = g_new0 (DirData, 1);
/* This will always be writeable */
BONOBO_CONFIG_DATABASE (archiver_db)->writeable = TRUE;
} }
BONOBO_X_TYPE_FUNC (BonoboConfigArchiver, PARENT_TYPE, bonobo_config_archiver); BONOBO_X_TYPE_FUNC (BonoboConfigArchiver, PARENT_TYPE, bonobo_config_archiver);

2
archiver/bonobo-moniker-archiver.c
View file

@ -74,7 +74,6 @@ archiver_resolve (BonoboMoniker *moniker,
name = bonobo_moniker_get_name (moniker); name = bonobo_moniker_get_name (moniker);
if (parent != CORBA_OBJECT_NIL) { if (parent != CORBA_OBJECT_NIL) {
pdb = Bonobo_Moniker_resolve (parent, options, pdb = Bonobo_Moniker_resolve (parent, options,
"IDL:Bonobo/ConfigDatabase:1.0", ev); "IDL:Bonobo/ConfigDatabase:1.0", ev);
@ -83,7 +82,6 @@ archiver_resolve (BonoboMoniker *moniker,
if (BONOBO_EX (ev) || pdb == CORBA_OBJECT_NIL) if (BONOBO_EX (ev) || pdb == CORBA_OBJECT_NIL)
return CORBA_OBJECT_NIL; return CORBA_OBJECT_NIL;
} }
if (parse_name (name, &backend_id, &location) < 0) { if (parse_name (name, &backend_id, &location) < 0) {

1
archiver/default-user.xml
View file

@ -3,6 +3,7 @@
<location> <location>
<contains backend="background-properties-capplet"/> <contains backend="background-properties-capplet"/>
<contains backend="bell-properties-capplet"/> <contains backend="bell-properties-capplet"/>
<contains backend="sound-properties"/>
<contains backend="keyboard-properties"/> <contains backend="keyboard-properties"/>
<contains backend="mouse-properties-capplet"/> <contains backend="mouse-properties-capplet"/>
<contains backend="screensaver-properties-capplet"/> <contains backend="screensaver-properties-capplet"/>

1
capplets/sound/ChangeLog
View file

@ -15,6 +15,7 @@
(apply_settings): Use the correct setting name (apply_settings): Use the correct setting name
(apply_cb): Apply settings and sync (apply_cb): Apply settings and sync
(apply_settings): Kill esd when requested (apply_settings): Kill esd when requested
(get_legacy_settings): Sync database
* sound-properties.xml: Fixed path name * sound-properties.xml: Fixed path name

7
capplets/sound/sound-properties-capplet.c
View file

@ -144,9 +144,16 @@ static void
get_legacy_settings (Bonobo_ConfigDatabase db) get_legacy_settings (Bonobo_ConfigDatabase db)
{ {
gboolean val_boolean, def; gboolean val_boolean, def;
CORBA_Environment ev;
CORBA_exception_init (&ev);
COPY_FROM_LEGACY (boolean, "enable_esd", bool, "/sound/system/settings/start_esd=false"); COPY_FROM_LEGACY (boolean, "enable_esd", bool, "/sound/system/settings/start_esd=false");
COPY_FROM_LEGACY (boolean, "event_sounds", bool, "/sound/system/settings/event_sounds=false"); COPY_FROM_LEGACY (boolean, "event_sounds", bool, "/sound/system/settings/event_sounds=false");
Bonobo_ConfigDatabase_sync (db, &ev);
CORBA_exception_free (&ev);
} }
/* start_esd /* start_esd