summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hestilow <hestilow@ximian.com>2002-02-15 01:13:17 +0000
committerRachel Hestilow <hestgray@src.gnome.org>2002-02-15 01:13:17 +0000
commit018a7f108fa88eb8ef3af7442f927f5182aefeba (patch)
treef7453f7eeaf62bcaf14dcd8292ee60980754bb91
parent6cb56800ed48c46888ea1c1ee2c13788aa0daad1 (diff)
downloadgnome-control-center-018a7f108fa88eb8ef3af7442f927f5182aefeba.tar.gz
Change configuration key prefix to CAPPLET_CONFIG_PREFIX/sound-properties.
2002-02-14 Richard Hestilow <hestilow@ximian.com> * sound-properties-capplet.c: Change configuration key prefix to CAPPLET_CONFIG_PREFIX/sound-properties.
-rw-r--r--capplets/sound/ChangeLog5
-rw-r--r--capplets/sound/sound-properties-capplet.c10
2 files changed, 11 insertions, 4 deletions
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index 24acf9a68..8357417cf 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-14 Richard Hestilow <hestilow@ximian.com>
+
+ * sound-properties-capplet.c: Change configuration
+ key prefix to CAPPLET_CONFIG_PREFIX/sound-properties.
+
2001-12-10 Israel Escalante <israel@ximian.com>
* Makefile.am (sound_properties_control_LDADD): Change top_srcdir to
diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c
index d9173ed51..12db329d6 100644
--- a/capplets/sound/sound-properties-capplet.c
+++ b/capplets/sound/sound-properties-capplet.c
@@ -36,6 +36,8 @@
#include <esd.h>
#include <sys/types.h>
+#define CP CAPPLET_CONFIG_PREFIX "sound-properties/"
+
/* Capplet-specific prototypes */
static SoundProperties *props = NULL;
@@ -55,8 +57,8 @@ apply_settings (Bonobo_ConfigDatabase db)
gboolean enable_esd;
gboolean event_sounds;
- enable_esd = bonobo_config_get_boolean (db, "/main/enable_esd", NULL);
- event_sounds = bonobo_config_get_boolean (db, "/main/event_sounds", NULL);
+ enable_esd = bonobo_config_get_boolean (db, CP "enable_esd", NULL);
+ event_sounds = bonobo_config_get_boolean (db, CP "event_sounds", NULL);
if (enable_esd && gnome_sound_connection < 0)
start_esd ();
@@ -232,8 +234,8 @@ get_legacy_settings (Bonobo_ConfigDatabase db)
{
gboolean val_boolean, def;
- COPY_FROM_LEGACY (boolean, "/main/enable_esd", bool, "/sound/system/settings/start_esd=false");
- COPY_FROM_LEGACY (boolean, "/main/event_sounds", bool, "/sound/system/settings/event_sounds=false");
+ COPY_FROM_LEGACY (boolean, CP "enable_esd", bool, "/sound/system/settings/start_esd=false");
+ COPY_FROM_LEGACY (boolean, CP "event_sounds", bool, "/sound/system/settings/event_sounds=false");
}
int