gnome-settings-daemon r274 - in trunk: . plugins/media-keys

[jensg svn gnome org]

Author: jensg
Date: Mon Apr  7 20:09:43 2008
New Revision: 274
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=274&view=rev

Log:
2008-04-07  Jens Granseuer  <jensgr gmx net>

	* plugins/media-keys/gsd-media-keys-manager.c: (do_sound_action): only
	use the built-in default for volume_step if we get an error from GConf,
	not just when the value is 0 which might be what the user wants (see
	the discussion on the Thinkpad driver again)


Modified:
   trunk/ChangeLog
   trunk/plugins/media-keys/gsd-media-keys-manager.c

Modified: trunk/plugins/media-keys/gsd-media-keys-manager.c
==============================================================================
--- trunk/plugins/media-keys/gsd-media-keys-manager.c	(original)
+++ trunk/plugins/media-keys/gsd-media-keys-manager.c	Mon Apr  7 20:09:43 2008
@@ -690,6 +690,7 @@
         gboolean muted;
         int      vol;
         int      vol_step;
+        GError  *error = NULL;
 
         if (manager->priv->volume == NULL) {
                 return;
@@ -697,10 +698,11 @@
 
         vol_step = gconf_client_get_int (manager->priv->conf_client,
                                          GCONF_MISC_DIR "/volume_step",
-                                         NULL);
+                                         &error);
 
-        if (vol_step == 0) {
+        if (error) {
                 vol_step = VOLUME_STEP;
+                g_error_free (error);
         }
 
         /* FIXME: this is racy */