reverted patch from bug #165343.

2008-01-14  Rodrigo Moya <rodrigo@gnome-db.org>

	* gnome-settings-multimedia-keys.c: reverted patch from bug #165343.

svn path=/trunk/; revision=8383
This commit is contained in:
Rodrigo Moya 2008-01-14 15:18:00 +00:00 committed by Rodrigo Moya
parent d178120b96
commit b6177042b1
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,7 @@
2008-01-14 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-multimedia-keys.c: reverted patch from bug #165343.
2008-01-05 Denis Washington <denisw@svn.gnome.org>
* gnome-settings-accessibility-keyboard.c: Don't depend on

View file

@ -45,10 +45,11 @@
/* we exclude shift, GDK_CONTROL_MASK and GDK_MOD1_MASK since we know what
these modifiers mean
these are the mods whose combinations are bound by the keygrabbing code */
#define IGNORED_MODS (0x2000 /*Xkb modifier*/ | GDK_LOCK_MASK | GDK_HYPER_MASK)
#define IGNORED_MODS (0x2000 /*Xkb modifier*/ | GDK_LOCK_MASK | \
- GDK_MOD2_MASK | GDK_MOD3_MASK | GDK_MOD4_MASK | GDK_MOD5_MASK)
/* these are the ones we actually use for global keys, we always only check
* for these set */
#define USED_MODS (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_SUPER_MASK | GDK_META_MASK)
#define USED_MODS (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)
typedef struct {
GnomeSettingsModule parent;