[gnome-settings-daemon] media-keys: Simplify the enumeration of keys

[Bastien Nocera <hadess src gnome org>]

commit efd0c4b28173e7264a14e74fd44e7484ee994dc0
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Nov 1 14:35:11 2011 +0000

    media-keys: Simplify the enumeration of keys

 plugins/media-keys/acme.h                   |    9 +++------
 plugins/media-keys/gsd-media-keys-manager.c |   12 ++++--------
 2 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/plugins/media-keys/acme.h b/plugins/media-keys/acme.h
index 54ec19b..0949de5 100644
--- a/plugins/media-keys/acme.h
+++ b/plugins/media-keys/acme.h
@@ -43,7 +43,6 @@ typedef enum {
         SEARCH_KEY,
         EMAIL_KEY,
         SCREENSAVER_KEY,
-        SCREENSAVER2_KEY,
         HELP_KEY,
         WWW_KEY,
         PLAY_KEY,
@@ -56,7 +55,6 @@ typedef enum {
         REPEAT_KEY,
         RANDOM_KEY,
         VIDEO_OUT_KEY,
-        VIDEO_OUT2_KEY,
         ROTATE_VIDEO_KEY,
         MAGNIFIER_KEY,
         SCREENREADER_KEY,
@@ -76,7 +74,6 @@ typedef enum {
         KEYBOARD_BRIGHTNESS_DOWN_KEY,
         KEYBOARD_BRIGHTNESS_TOGGLE_KEY,
         BATTERY_KEY,
-        HANDLED_KEYS
 } MediaKeyType;
 
 static struct {
@@ -84,7 +81,7 @@ static struct {
         const char *settings_key;
         const char *hard_coded;
         Key *key;
-} keys[HANDLED_KEYS] = {
+} keys[] = {
         { TOUCHPAD_KEY, NULL, "XF86TouchpadToggle", NULL },
 	{ TOUCHPAD_ON_KEY, NULL, "XF86TouchpadOn", NULL },
 	{ TOUCHPAD_OFF_KEY, NULL, "XF86TouchpadOff", NULL },
@@ -102,7 +99,7 @@ static struct {
         { SEARCH_KEY, "search", NULL, NULL },
         { EMAIL_KEY, "email", NULL, NULL },
         { SCREENSAVER_KEY, "screensaver", NULL, NULL },
-        { SCREENSAVER2_KEY, NULL, "XF86ScreenSaver", NULL },
+        { SCREENSAVER_KEY, NULL, "XF86ScreenSaver", NULL },
         { HELP_KEY, "help", NULL, NULL },
         { WWW_KEY, "www", NULL, NULL },
         { PLAY_KEY, "play", NULL, NULL },
@@ -117,7 +114,7 @@ static struct {
         { RANDOM_KEY, NULL, "XF86AudioRandomPlay", NULL},
         { VIDEO_OUT_KEY, NULL, "<Super>p", NULL },
         /* Key code of the XF86Display key (Fn-F7 on Thinkpads, Fn-F4 on HP machines, etc.) */
-        { VIDEO_OUT2_KEY, NULL, "XF86Display", NULL },
+        { VIDEO_OUT_KEY, NULL, "XF86Display", NULL },
         /* Key code of the XF86RotateWindows key (present on some tablets) */
         { ROTATE_VIDEO_KEY, NULL, "XF86RotateWindows", NULL },
 	{ MAGNIFIER_KEY, "magnifier", NULL, NULL },
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index e3f0a11..ca5f11f 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -328,7 +328,7 @@ update_kbd_cb (GSettings           *settings,
         gdk_error_trap_push ();
 
         /* Find the key that was modified */
-        for (i = 0; i < HANDLED_KEYS; i++) {
+        for (i = 0; i < G_N_ELEMENTS (keys); i++) {
                 /* Skip over hard-coded keys */
                 if (keys[i].settings_key == NULL)
                         continue;
@@ -386,7 +386,7 @@ init_kbd (GsdMediaKeysManager *manager)
 
         gdk_error_trap_push ();
 
-        for (i = 0; i < HANDLED_KEYS; i++) {
+        for (i = 0; i < G_N_ELEMENTS (keys); i++) {
                 char *tmp;
                 Key  *key;
                 EggParseError ret;
@@ -1633,7 +1633,6 @@ do_action (GsdMediaKeysManager *manager,
                 do_url_action (manager, "mailto", timestamp);
                 break;
         case SCREENSAVER_KEY:
-        case SCREENSAVER2_KEY:
                 execute (manager, "gnome-screensaver-command --lock", FALSE, FALSE);
                 break;
         case HELP_KEY:
@@ -1667,7 +1666,6 @@ do_action (GsdMediaKeysManager *manager,
         case RANDOM_KEY:
                 return do_multimedia_player_action (manager, "Shuffle");
         case VIDEO_OUT_KEY:
-        case VIDEO_OUT2_KEY:
                 do_video_out_action (manager, timestamp);
                 break;
         case ROTATE_VIDEO_KEY:
@@ -1717,8 +1715,6 @@ do_action (GsdMediaKeysManager *manager,
         case BATTERY_KEY:
                 do_execute_desktop (manager, "gnome-power-statistics.desktop", timestamp);
                 break;
-        case HANDLED_KEYS:
-                g_assert_not_reached ();
         /* Note, no default so compiler catches missing keys */
         }
 
@@ -1771,7 +1767,7 @@ acme_filter_events (XEvent              *xevent,
 
 	deviceid = xev->sourceid;
 
-        for (i = 0; i < HANDLED_KEYS; i++) {
+        for (i = 0; i < G_N_ELEMENTS (keys); i++) {
                 if (match_xi2_key (keys[i].key, xev)) {
                         switch (keys[i].key_type) {
                         case VOLUME_DOWN_KEY:
@@ -2027,7 +2023,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
         need_flush = FALSE;
         gdk_error_trap_push ();
 
-        for (i = 0; i < HANDLED_KEYS; ++i) {
+        for (i = 0; i < G_N_ELEMENTS (keys); ++i) {
                 if (keys[i].key) {
                         need_flush = TRUE;
                         grab_key_unsafe (keys[i].key, FALSE, priv->screens);