diff -rupN old/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in new/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in --- old/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2015-05-04 15:32:57.000000000 +0200 +++ new/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2015-05-29 11:55:56.423075521 +0200 @@ -124,5 +124,11 @@ <_summary>Priority to use for this plugin <_description>Priority to use for this plugin in gnome-settings-daemon startup queue + + 6 + + <_summary>Size of volume step + <_description>Size of the volume step for each consecutive press of the volume up or volume down key + diff -rupN old/plugins/media-keys/gsd-media-keys-manager.c new/plugins/media-keys/gsd-media-keys-manager.c --- old/plugins/media-keys/gsd-media-keys-manager.c 2015-05-04 15:32:57.000000000 +0200 +++ new/plugins/media-keys/gsd-media-keys-manager.c 2015-05-29 12:04:31.312850233 +0200 @@ -102,10 +102,11 @@ static const gchar introspection_xml[] = #define SETTINGS_POWER_DIR "org.gnome.settings-daemon.plugins.power" #define SETTINGS_XSETTINGS_DIR "org.gnome.settings-daemon.plugins.xsettings" #define SETTINGS_TOUCHPAD_DIR "org.gnome.desktop.peripherals.touchpad" +#define SETTINGS_SOUND_DIR "org.gnome.settings-daemon.plugins.sound" #define TOUCHPAD_ENABLED_KEY "send-events" +#define VOLUME_STEP_KEY "volume-step" #define HIGH_CONTRAST "HighContrast" -#define VOLUME_STEP 6 /* percents for one volume button press */ #define MAX_VOLUME 65536.0 #define SYSTEMD_DBUS_NAME "org.freedesktop.login1" @@ -144,6 +145,7 @@ struct GsdMediaKeysManagerPrivate GvcMixerStream *source; ca_context *ca; GtkSettings *gtksettings; + GSettings *sound_settings; #ifdef HAVE_GUDEV GHashTable *streams; /* key = X device ID, value = stream id */ GUdevClient *udev_client; @@ -1180,7 +1182,7 @@ do_sound_action (GsdMediaKeysManager *ma { GvcMixerStream *stream; gboolean old_muted, new_muted; - guint old_vol, new_vol, norm_vol_step; + guint old_vol, new_vol, vol_step, norm_vol_step; gboolean sound_changed; /* Find the stream that corresponds to the device, if any */ @@ -1199,7 +1201,8 @@ do_sound_action (GsdMediaKeysManager *ma if (stream == NULL) return; - norm_vol_step = PA_VOLUME_NORM * VOLUME_STEP / 100; + vol_step = g_settings_get_int (manager->priv->sound_settings, VOLUME_STEP_KEY); + norm_vol_step = PA_VOLUME_NORM * vol_step / 100; /* FIXME: this is racy */ new_vol = old_vol = gvc_mixer_stream_get_volume (stream); @@ -2357,6 +2360,8 @@ start_media_keys_idle_cb (GsdMediaKeysMa g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); + manager->priv->sound_settings = g_settings_new (SETTINGS_SOUND_DIR); + /* for the power plugin interface code */ manager->priv->power_settings = g_settings_new (SETTINGS_POWER_DIR); @@ -2460,6 +2465,7 @@ gsd_media_keys_manager_stop (GsdMediaKey g_clear_object (&priv->logind_proxy); g_clear_object (&priv->settings); + g_clear_object (&priv->sound_settings); g_clear_object (&priv->power_settings); g_clear_object (&priv->power_proxy); g_clear_object (&priv->power_screen_proxy);