Index: gnome-settings-daemon/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/ChangeLog,v
retrieving revision 1.24
diff -u -r1.24 ChangeLog
--- gnome-settings-daemon/ChangeLog	6 Mar 2002 18:17:33 -0000	1.24
+++ gnome-settings-daemon/ChangeLog	7 Mar 2002 20:57:05 -0000
@@ -1,3 +1,8 @@
+2002-03-07  Lauris Kaplinski  <lauris@ximian.com>
+
+	* gnome-settings-keyboard.c (apply_settings): Use correct GConf keys,
+	click volume is of type float, not int
+
 2002-03-06  Miles Lane  <miles@megapathdsl.net>
 
 	* gnome-settings-daemon.c -- Correct the gnome_program_init()
Index: gnome-settings-daemon/gnome-settings-keyboard.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/gnome-settings-keyboard.c,v
retrieving revision 1.5
diff -u -r1.5 gnome-settings-keyboard.c
--- gnome-settings-daemon/gnome-settings-keyboard.c	21 Jan 2002 06:38:45 -0000	1.5
+++ gnome-settings-daemon/gnome-settings-keyboard.c	7 Mar 2002 20:57:05 -0000
@@ -43,8 +43,9 @@
 	GConfClient *client;
 
 	gboolean repeat, click;
-	int rate, delay, volume;
+	int rate, delay;
 	int bell_volume, bell_pitch, bell_duration;
+	double volume;
 
 #ifdef HAVE_X11_EXTENSIONS_XF86MISC_H
 	XF86MiscKbdSettings kbdsettings;
@@ -54,14 +55,14 @@
 
 	client = gconf_client_get_default ();
 
-	repeat        = gconf_client_get_bool (client, "/gnome/desktop/peripherals/keyboard/repeat",        NULL);
-	click         = gconf_client_get_bool (client, "/gnome/desktop/peripherals/keyboard/click",         NULL);
-	rate          = gconf_client_get_int  (client, "/gnome/desktop/peripherals/keyboard/rate",          NULL);
-	delay         = gconf_client_get_int  (client, "/gnome/desktop/peripherals/keyboard/delay",         NULL);
-	volume        = gconf_client_get_int  (client, "/gnome/desktop/peripherals/keyboard/click_volume",  NULL);
-	bell_volume   = gconf_client_get_int  (client, "/gnome/desktop/peripherals/keyboard/bell_volume",   NULL);
-	bell_pitch    = gconf_client_get_int  (client, "/gnome/desktop/peripherals/keyboard/bell_pitch",    NULL);
-	bell_duration = gconf_client_get_int  (client, "/gnome/desktop/peripherals/keyboard/bell_duration", NULL);
+	repeat        = gconf_client_get_bool  (client, "/desktop/gnome/peripherals/keyboard/repeat",        NULL);
+	click         = gconf_client_get_bool  (client, "/desktop/gnome/peripherals/keyboard/click",         NULL);
+	rate          = gconf_client_get_int   (client, "/desktop/gnome/peripherals/keyboard/rate",          NULL);
+	delay         = gconf_client_get_int   (client, "/desktop/gnome/peripherals/keyboard/delay",         NULL);
+	volume        = gconf_client_get_float (client, "/desktop/gnome/peripherals/keyboard/click_volume",  NULL);
+	bell_volume   = gconf_client_get_int   (client, "/desktop/gnome/peripherals/keyboard/bell_volume",   NULL);
+	bell_pitch    = gconf_client_get_int   (client, "/desktop/gnome/peripherals/keyboard/bell_pitch",    NULL);
+	bell_duration = gconf_client_get_int   (client, "/desktop/gnome/peripherals/keyboard/bell_duration", NULL);
 
         if (repeat) {
 		XAutoRepeatOn (GDK_DISPLAY ());
