diff options
Diffstat (limited to 'volume-step.patch')
| -rw-r--r--[-rwxr-xr-x] | volume-step.patch | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/volume-step.patch b/volume-step.patch index 69a99e0ee3f6..52d44b0d185a 100755..100644 --- a/volume-step.patch +++ b/volume-step.patch @@ -1,10 +1,13 @@ -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</_summary> - <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description> - </key> +diff -Naur 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 2017-04-25 22:27:31.773381096 +0200 ++++ new/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2017-04-25 22:27:55.780117516 +0200 +@@ -14,5 +14,14 @@ + <child name="power" schema="org.gnome.settings-daemon.plugins.power"/> + <child name="xrandr" schema="org.gnome.settings-daemon.plugins.xrandr"/> + <child name="xsettings" schema="org.gnome.settings-daemon.plugins.xsettings"/> ++ <child name="sound" schema="org.gnome.settings-daemon.plugins.sound"/> ++ </schema> ++ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.sound" path="/org/gnome/settings-daemon/plugins/sound/"> + <key name="volume-step" type="i"> + <default>6</default> + <range min="1" max="20"/> @@ -13,14 +16,15 @@ diff -rupN old/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in new/data + </key> </schema> </schemalist> -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[] = +diff -Naur 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 2017-04-25 22:27:31.780047784 +0200 ++++ new/plugins/media-keys/gsd-media-keys-manager.c 2017-04-25 22:27:55.783450858 +0200 +@@ -104,11 +104,12 @@ + #define SETTINGS_INTERFACE_DIR "org.gnome.desktop.interface" #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 SETTINGS_TOUCHPAD_DIR "org.gnome.desktop.peripherals.touchpad" #define TOUCHPAD_ENABLED_KEY "send-events" +#define VOLUME_STEP_KEY "volume-step" #define HIGH_CONTRAST "HighContrast" @@ -29,7 +33,7 @@ diff -rupN old/plugins/media-keys/gsd-media-keys-manager.c new/plugins/media-key #define MAX_VOLUME 65536.0 #define SYSTEMD_DBUS_NAME "org.freedesktop.login1" -@@ -144,6 +145,7 @@ struct GsdMediaKeysManagerPrivate +@@ -154,6 +155,7 @@ GvcMixerStream *source; ca_context *ca; GtkSettings *gtksettings; @@ -37,7 +41,7 @@ diff -rupN old/plugins/media-keys/gsd-media-keys-manager.c new/plugins/media-key #ifdef HAVE_GUDEV GHashTable *streams; /* key = X device ID, value = stream id */ GUdevClient *udev_client; -@@ -1180,7 +1182,7 @@ do_sound_action (GsdMediaKeysManager *ma +@@ -1272,7 +1274,7 @@ { GvcMixerStream *stream; gboolean old_muted, new_muted; @@ -46,7 +50,7 @@ diff -rupN old/plugins/media-keys/gsd-media-keys-manager.c new/plugins/media-key gboolean sound_changed; /* Find the stream that corresponds to the device, if any */ -@@ -1199,7 +1201,8 @@ do_sound_action (GsdMediaKeysManager *ma +@@ -1291,7 +1293,8 @@ if (stream == NULL) return; @@ -56,7 +60,7 @@ diff -rupN old/plugins/media-keys/gsd-media-keys-manager.c new/plugins/media-key /* FIXME: this is racy */ new_vol = old_vol = gvc_mixer_stream_get_volume (stream); -@@ -2357,6 +2360,8 @@ start_media_keys_idle_cb (GsdMediaKeysMa +@@ -2842,6 +2845,8 @@ g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); @@ -64,8 +68,8 @@ diff -rupN old/plugins/media-keys/gsd-media-keys-manager.c new/plugins/media-key + /* 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 + manager->priv->chassis_type = gnome_settings_get_chassis_type (); +@@ -2959,6 +2964,7 @@ g_clear_object (&priv->logind_proxy); g_clear_object (&priv->settings); |