pool/gnome-settings-daemon
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 36332 from GNOME:Factory

Browse Source 
Copy from GNOME:Factory/gnome-settings-daemon based on submit request 36332 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/36332
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=48
This commit is contained in:
OBS User autobuild 2010-04-01 01:30:18 +00:00 committed by Git OBS Bridge
commit 9112745cb3
6 changed files with 51 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-settings-daemon-2.29.92.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c27097f5db4e19926729d961e30ec8e0f7a9c565daa0d2674c4f02d0cb2c8c19
size 1223347

3
gnome-settings-daemon-2.30.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb759f2aa403ad10f7b0a196c523fa0b3842cf4432b26a4b308ed1e5bf67e6aa
size 1230687

13
gnome-settings-daemon-add-layout-switcher.patch
View File

@ -1,7 +1,7 @@
Index: plugins/keyboard/gsd-keyboard-xkb.c Index: plugins/keyboard/gsd-keyboard-xkb.c
=================================================================== ===================================================================
--- plugins/keyboard/gsd-keyboard-xkb.c.orig 2010-01-13 02:51:57.000000000 +1100 --- plugins/keyboard/gsd-keyboard-xkb.c.orig
+++ plugins/keyboard/gsd-keyboard-xkb.c 2010-01-13 16:44:53.000000000 +1100 +++ plugins/keyboard/gsd-keyboard-xkb.c
@@ -461,6 +461,103 @@ show_hide_icon () @@ -461,6 +461,103 @@ show_hide_icon ()
} }
} }
@ -106,12 +106,11 @@ Index: plugins/keyboard/gsd-keyboard-xkb.c
static gboolean static gboolean
try_activating_xkb_config_if_new (GkbdKeyboardConfig * try_activating_xkb_config_if_new (GkbdKeyboardConfig *
current_sys_kbd_config) current_sys_kbd_config)
@@ -621,6 +718,8 @@ apply_xkb_settings (void) @@ -623,6 +720,7 @@ apply_xkb_settings (void)
g_slist_foreach (free_layouts,
(GFunc) g_free, NULL);
g_slist_free (free_layouts); g_slist_free (free_layouts);
+
+ _maybe_add_layout_switcher (layouts, conf_client);
} }
+ _maybe_add_layout_switcher (layouts, conf_client);
gconf_client_set_list (conf_client, gconf_client_set_list (conf_client,
GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS,
GCONF_VALUE_STRING, layouts,

31
gnome-settings-daemon-bnc462640-mute-action.patch
View File

@ -1,8 +1,8 @@
Index: data/apps_gnome_settings_daemon_keybindings.schemas.in Index: data/apps_gnome_settings_daemon_keybindings.schemas.in
=================================================================== ===================================================================
--- data/apps_gnome_settings_daemon_keybindings.schemas.in.orig 2010-01-13 02:51:57.000000000 +1100 --- data/apps_gnome_settings_daemon_keybindings.schemas.in.orig
+++ data/apps_gnome_settings_daemon_keybindings.schemas.in 2010-01-13 16:44:53.000000000 +1100 +++ data/apps_gnome_settings_daemon_keybindings.schemas.in
@@ -14,6 +14,17 @@ @@ -25,6 +25,17 @@
</schema> </schema>
<schema> <schema>
@ -22,25 +22,25 @@ Index: data/apps_gnome_settings_daemon_keybindings.schemas.in
<type>string</type> <type>string</type>
Index: plugins/media-keys/gsd-media-keys-manager.c Index: plugins/media-keys/gsd-media-keys-manager.c
=================================================================== ===================================================================
--- plugins/media-keys/gsd-media-keys-manager.c.orig 2010-01-13 02:51:57.000000000 +1100 --- plugins/media-keys/gsd-media-keys-manager.c.orig
+++ plugins/media-keys/gsd-media-keys-manager.c 2010-01-13 16:44:53.000000000 +1100 +++ plugins/media-keys/gsd-media-keys-manager.c
@@ -636,8 +636,10 @@ do_sound_action (GsdMediaKeysManager *ma @@ -681,9 +681,11 @@ do_sound_action (GsdMediaKeysManager *ma
int type) int type)
{ {
gboolean muted; gboolean muted;
+ gboolean toggle_mute; + gboolean toggle_mute;
guint vol, norm_vol_step; guint vol, norm_vol_step;
int vol_step; int vol_step;
gboolean sound_changed;
+ GError *error; + GError *error;
if (manager->priv->stream == NULL) if (manager->priv->stream == NULL)
return; return;
@@ -658,7 +660,23 @@ do_sound_action (GsdMediaKeysManager *ma @@ -704,7 +706,21 @@ do_sound_action (GsdMediaKeysManager *ma
switch (type) { switch (type) {
case MUTE_KEY: case MUTE_KEY:
muted = !muted; - muted = !muted;
- gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
+
+ error = NULL; + error = NULL;
+ toggle_mute = gconf_client_get_bool (manager->priv->conf_client, + toggle_mute = gconf_client_get_bool (manager->priv->conf_client,
+ GCONF_MISC_DIR "/toggle_mute", + GCONF_MISC_DIR "/toggle_mute",
@ -52,11 +52,10 @@ Index: plugins/media-keys/gsd-media-keys-manager.c
+ } + }
+ +
+ if (toggle_mute) + if (toggle_mute)
+ gvc_mixer_stream_change_is_muted (manager->priv->stream, + muted = !muted;
+ muted);
+ else + else
+ gvc_mixer_stream_change_is_muted (manager->priv->stream, + muted = TRUE;
+ TRUE); +
gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
sound_changed = TRUE;
break; break;
case VOLUME_DOWN_KEY:
if (!muted && (vol <= norm_vol_step)) {

25
gnome-settings-daemon.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Mon Mar 29 17:38:21 CEST 2010 - vuntz@opensuse.org
- Update to version 2.30.0:
+ Protect XInput code by ifdefs if XInput isn't available
(bgo#611670)
+ Don't play a sound when the volume doesn't change (bgo#610001)
+ Fix linking with pedantic linkers (bgo#610244)
+ Remove unused do_sleep_action function
+ Apply all keyboard settings to new keyboards (bgo#610245)
+ Ensure the window is realized before we invalidate it
(bgo#604918)
+ Replace "eject" spawn with GIO code (bgo#580779)
+ Don't spawn xrdb (bgo#586276)
+ Add translator hint (bgo#613647)
+ Disable font plugin by default (bgo#613604)
+ Updated translations.
- Rebase gnome-settings-daemon-bnc462640-mute-action.patch.
-------------------------------------------------------------------
Fri Mar 26 22:58:04 UTC 2010 - sreeves@novell.com
- Fix gnome-settings-daemon-add-layout-switcher.patch
+ call maybe_add_layout_switcher method at the right level
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 8 15:02:14 CET 2010 - dimstar@opensuse.org Mon Mar 8 15:02:14 CET 2010 - dimstar@opensuse.org

4
gnome-settings-daemon.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gnome-settings-daemon (Version 2.29.92) # spec file for package gnome-settings-daemon (Version 2.30.0)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -19,7 +19,7 @@
Name: gnome-settings-daemon Name: gnome-settings-daemon
%define _name gnome-settings-daemon %define _name gnome-settings-daemon
Version: 2.29.92 Version: 2.30.0
Release: 1 Release: 1
License: GPLv2+ License: GPLv2+
Summary: Settings daemon for the GNOME desktop Summary: Settings daemon for the GNOME desktop