[gnome-settings-daemon] media-keys: Extract the MediaKeyType enum into its own header

[Rui Matos <rtcm src gnome org>]

commit f6df8460678fcc632d35ec678b017e64a938393d
Author: Rui Matos <tiagomatos gmail com>
Date:   Thu May 22 21:07:14 2014 +0200

    media-keys: Extract the MediaKeyType enum into its own header
    
    This allows us to not include shortcuts-list.h in other files and thus
    avoids the media_keys array being defined in more than one place.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=730765

 plugins/media-keys/Makefile.am            |    1 +
 plugins/media-keys/gsd-screenshot-utils.h |    2 +-
 plugins/media-keys/media-keys.h           |   87 +++++++++++++++++++++++++++++
 plugins/media-keys/shortcuts-list.h       |   67 +----------------------
 4 files changed, 90 insertions(+), 67 deletions(-)
---
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 63d3219..d6022b0 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -35,6 +35,7 @@ libmedia_keys_la_SOURCES =            \
        gsd-screenshot-utils.h          \
        gsd-screenshot-utils.c          \
        shortcuts-list.h                \
+       media-keys.h                    \
        shell-keybinding-modes.h        \
        bus-watch-namespace.c           \
        bus-watch-namespace.h           \
diff --git a/plugins/media-keys/gsd-screenshot-utils.h b/plugins/media-keys/gsd-screenshot-utils.h
index 67efae6..39ae136 100644
--- a/plugins/media-keys/gsd-screenshot-utils.h
+++ b/plugins/media-keys/gsd-screenshot-utils.h
@@ -25,7 +25,7 @@
 #ifndef __GSD_SCREENSHOT_UTILS_H__
 #define __GSD_SCREENSHOT_UTILS_H__
 
-#include "shortcuts-list.h"
+#include "media-keys.h"
 
 G_BEGIN_DECLS
 
diff --git a/plugins/media-keys/media-keys.h b/plugins/media-keys/media-keys.h
new file mode 100644
index 0000000..e32425e
--- /dev/null
+++ b/plugins/media-keys/media-keys.h
@@ -0,0 +1,87 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2001 Bastien Nocera <hadess hadess net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MEDIA_KEYS_H__
+#define __MEDIA_KEYS_H__
+
+typedef enum {
+        TOUCHPAD_KEY,
+        TOUCHPAD_ON_KEY,
+        TOUCHPAD_OFF_KEY,
+        MUTE_KEY,
+        VOLUME_DOWN_KEY,
+        VOLUME_UP_KEY,
+        MUTE_QUIET_KEY,
+        VOLUME_DOWN_QUIET_KEY,
+        VOLUME_UP_QUIET_KEY,
+        MIC_MUTE_KEY,
+        LOGOUT_KEY,
+        EJECT_KEY,
+        HOME_KEY,
+        MEDIA_KEY,
+        CALCULATOR_KEY,
+        SEARCH_KEY,
+        EMAIL_KEY,
+        SCREENSAVER_KEY,
+        HELP_KEY,
+        SCREENSHOT_KEY,
+        WINDOW_SCREENSHOT_KEY,
+        AREA_SCREENSHOT_KEY,
+        SCREENSHOT_CLIP_KEY,
+        WINDOW_SCREENSHOT_CLIP_KEY,
+        AREA_SCREENSHOT_CLIP_KEY,
+        SCREENCAST_KEY,
+        WWW_KEY,
+        PLAY_KEY,
+        PAUSE_KEY,
+        STOP_KEY,
+        PREVIOUS_KEY,
+        NEXT_KEY,
+        REWIND_KEY,
+        FORWARD_KEY,
+        REPEAT_KEY,
+        RANDOM_KEY,
+        VIDEO_OUT_KEY,
+        ROTATE_VIDEO_KEY,
+        ROTATE_VIDEO_LOCK_KEY,
+        MAGNIFIER_KEY,
+        SCREENREADER_KEY,
+        ON_SCREEN_KEYBOARD_KEY,
+        INCREASE_TEXT_KEY,
+        DECREASE_TEXT_KEY,
+        TOGGLE_CONTRAST_KEY,
+        MAGNIFIER_ZOOM_IN_KEY,
+        MAGNIFIER_ZOOM_OUT_KEY,
+        POWER_KEY,
+        SLEEP_KEY,
+        SUSPEND_KEY,
+        HIBERNATE_KEY,
+        POWER_KEY_NO_DIALOG,
+        SLEEP_KEY_NO_DIALOG,
+        SUSPEND_KEY_NO_DIALOG,
+        HIBERNATE_KEY_NO_DIALOG,
+        SCREEN_BRIGHTNESS_UP_KEY,
+        SCREEN_BRIGHTNESS_DOWN_KEY,
+        KEYBOARD_BRIGHTNESS_UP_KEY,
+        KEYBOARD_BRIGHTNESS_DOWN_KEY,
+        KEYBOARD_BRIGHTNESS_TOGGLE_KEY,
+        BATTERY_KEY,
+        CUSTOM_KEY
+} MediaKeyType;
+
+#endif  /* __MEDIA_KEYS_H__ */
diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h
index 1e87dd7..d32edfc 100644
--- a/plugins/media-keys/shortcuts-list.h
+++ b/plugins/media-keys/shortcuts-list.h
@@ -20,75 +20,10 @@
 #define __SHORTCUTS_LIST_H__
 
 #include "shell-keybinding-modes.h"
+#include "media-keys.h"
 
 #define SETTINGS_BINDING_DIR "org.gnome.settings-daemon.plugins.media-keys"
 
-typedef enum {
-        TOUCHPAD_KEY,
-        TOUCHPAD_ON_KEY,
-        TOUCHPAD_OFF_KEY,
-        MUTE_KEY,
-        VOLUME_DOWN_KEY,
-        VOLUME_UP_KEY,
-        MUTE_QUIET_KEY,
-        VOLUME_DOWN_QUIET_KEY,
-        VOLUME_UP_QUIET_KEY,
-        MIC_MUTE_KEY,
-        LOGOUT_KEY,
-        EJECT_KEY,
-        HOME_KEY,
-        MEDIA_KEY,
-        CALCULATOR_KEY,
-        SEARCH_KEY,
-        EMAIL_KEY,
-        SCREENSAVER_KEY,
-        HELP_KEY,
-        SCREENSHOT_KEY,
-        WINDOW_SCREENSHOT_KEY,
-        AREA_SCREENSHOT_KEY,
-        SCREENSHOT_CLIP_KEY,
-        WINDOW_SCREENSHOT_CLIP_KEY,
-        AREA_SCREENSHOT_CLIP_KEY,
-        SCREENCAST_KEY,
-        WWW_KEY,
-        PLAY_KEY,
-        PAUSE_KEY,
-        STOP_KEY,
-        PREVIOUS_KEY,
-        NEXT_KEY,
-        REWIND_KEY,
-        FORWARD_KEY,
-        REPEAT_KEY,
-        RANDOM_KEY,
-        VIDEO_OUT_KEY,
-        ROTATE_VIDEO_KEY,
-        ROTATE_VIDEO_LOCK_KEY,
-        MAGNIFIER_KEY,
-        SCREENREADER_KEY,
-        ON_SCREEN_KEYBOARD_KEY,
-        INCREASE_TEXT_KEY,
-        DECREASE_TEXT_KEY,
-        TOGGLE_CONTRAST_KEY,
-        MAGNIFIER_ZOOM_IN_KEY,
-        MAGNIFIER_ZOOM_OUT_KEY,
-        POWER_KEY,
-        SLEEP_KEY,
-        SUSPEND_KEY,
-        HIBERNATE_KEY,
-        POWER_KEY_NO_DIALOG,
-        SLEEP_KEY_NO_DIALOG,
-        SUSPEND_KEY_NO_DIALOG,
-        HIBERNATE_KEY_NO_DIALOG,
-        SCREEN_BRIGHTNESS_UP_KEY,
-        SCREEN_BRIGHTNESS_DOWN_KEY,
-        KEYBOARD_BRIGHTNESS_UP_KEY,
-        KEYBOARD_BRIGHTNESS_DOWN_KEY,
-        KEYBOARD_BRIGHTNESS_TOGGLE_KEY,
-        BATTERY_KEY,
-        CUSTOM_KEY
-} MediaKeyType;
-
-
 #define GSD_KEYBINDING_MODE_LAUNCHER (SHELL_KEYBINDING_MODE_NORMAL | \
                                       SHELL_KEYBINDING_MODE_OVERVIEW)
 #define SCREENSAVER_MODE SHELL_KEYBINDING_MODE_ALL & ~SHELL_KEYBINDING_MODE_UNLOCK_SCREEN