diff options
| author | Stefano Karapetsas <[email protected]> | 2012-12-17 10:45:12 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-12-17 10:45:12 -0800 |
| commit | f6c53419d075eb15dd952119bfc0bc9db2c30fbd (patch) | |
| tree | 42555106b98bfe3334642846ddd16f905109bb43 /plugins/media-keys/msd-media-keys-manager.c | |
| parent | 85c5ae14d75e3413b8f3f3aa38205ea852dcb20d (diff) | |
| parent | 77ec1e052debbc08d4ff2be945889150ebe2a867 (diff) | |
| download | mate-settings-daemon-f6c53419d075eb15dd952119bfc0bc9db2c30fbd.tar.bz2 mate-settings-daemon-f6c53419d075eb15dd952119bfc0bc9db2c30fbd.tar.xz | |
Merge pull request #33 from bhull2010/master
Restore volume-step preference instead of hardcoding it
Diffstat (limited to 'plugins/media-keys/msd-media-keys-manager.c')
| -rw-r--r-- | plugins/media-keys/msd-media-keys-manager.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c index 5583416..37369de 100644 --- a/plugins/media-keys/msd-media-keys-manager.c +++ b/plugins/media-keys/msd-media-keys-manager.c @@ -657,7 +657,10 @@ do_sound_action (MsdMediaKeysManager *manager, return; #endif - vol_step = VOLUME_STEP; + vol_step = g_settings_get_int (manager->priv->settings, "volume-step"); + + if (vol_step <= 0 || vol_step > 100) + vol_step = VOLUME_STEP; #ifdef HAVE_PULSE norm_vol_step = PA_VOLUME_NORM * vol_step / 100; |