From 0dc63f395dbb1c224b028622d715d84ee55e4457 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 7 Apr 2014 11:06:55 -0400 Subject: [PATCH] accel-parse: Remove support for --- src/core/meta-accel-parse.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/src/core/meta-accel-parse.c b/src/core/meta-accel-parse.c index be86af12d..ceba9bc39 100644 --- a/src/core/meta-accel-parse.c +++ b/src/core/meta-accel-parse.c @@ -109,20 +109,6 @@ is_control (const gchar *string) (string[8] == '>')); } -static inline gboolean -is_release (const gchar *string) -{ - return ((string[0] == '<') && - (string[1] == 'r' || string[1] == 'R') && - (string[2] == 'e' || string[2] == 'E') && - (string[3] == 'l' || string[3] == 'L') && - (string[4] == 'e' || string[4] == 'E') && - (string[5] == 'a' || string[5] == 'A') && - (string[6] == 's' || string[6] == 'S') && - (string[7] == 'e' || string[7] == 'E') && - (string[8] == '>')); -} - static inline gboolean is_meta (const gchar *string) { @@ -208,13 +194,7 @@ accelerator_parse (const gchar *accelerator, { if (*accelerator == '<') { - if (len >= 9 && is_release (accelerator)) - { - accelerator += 9; - len -= 9; - mods |= GDK_RELEASE_MASK; - } - else if (len >= 9 && is_primary (accelerator)) + if (len >= 9 && is_primary (accelerator)) { /* Primary is treated the same as Control */ accelerator += 9; @@ -363,9 +343,6 @@ meta_parse_accelerator (const char *accel, if (gdk_sym == None && gdk_code == 0) return FALSE; - if (gdk_mask & GDK_RELEASE_MASK) /* we don't allow this */ - return FALSE; - *keysym = gdk_sym; *keycode = gdk_code; @@ -412,9 +389,6 @@ meta_parse_modifier (const char *accel, if (gdk_sym != None || gdk_code != 0) return FALSE; - - if (gdk_mask & GDK_RELEASE_MASK) /* we don't allow this */ - return FALSE; if (gdk_mask & GDK_SHIFT_MASK) *mask |= META_VIRTUAL_SHIFT_MASK;