Remove Gnome specific key binding support from core.

1 files changed, 27 insertions, 37 deletions

diff --git a/include/compiz-core.h b/include/compiz-core.h
index 38ad93d2..b29c2b3c 100644
--- a/include/compiz-core.h
+++ b/include/compiz-core.h
@@ -747,41 +747,33 @@ removeFileWatch (CompFileWatchHandle handle);
 #define COMP_DISPLAY_OPTION_AUTORAISE_DELAY                  5
 #define COMP_DISPLAY_OPTION_CLOSE_WINDOW_KEY                 6
 #define COMP_DISPLAY_OPTION_CLOSE_WINDOW_BUTTON              7
-#define COMP_DISPLAY_OPTION_MAIN_MENU_KEY                    8
-#define COMP_DISPLAY_OPTION_RUN_DIALOG_KEY                   9
-#define COMP_DISPLAY_OPTION_SLOW_ANIMATIONS_KEY              10
-#define COMP_DISPLAY_OPTION_RAISE_WINDOW_KEY                 11
-#define COMP_DISPLAY_OPTION_RAISE_WINDOW_BUTTON              12
-#define COMP_DISPLAY_OPTION_LOWER_WINDOW_KEY                 13
-#define COMP_DISPLAY_OPTION_LOWER_WINDOW_BUTTON              14
-#define COMP_DISPLAY_OPTION_UNMAXIMIZE_WINDOW_KEY            15
-#define COMP_DISPLAY_OPTION_MINIMIZE_WINDOW_KEY              16
-#define COMP_DISPLAY_OPTION_MINIMIZE_WINDOW_BUTTON           17
-#define COMP_DISPLAY_OPTION_MAXIMIZE_WINDOW_KEY              18
-#define COMP_DISPLAY_OPTION_MAXIMIZE_WINDOW_HORZ_KEY         19
-#define COMP_DISPLAY_OPTION_MAXIMIZE_WINDOW_VERT_KEY         20
-#define COMP_DISPLAY_OPTION_SCREENSHOT                       21
-#define COMP_DISPLAY_OPTION_RUN_SCREENSHOT_KEY               22
-#define COMP_DISPLAY_OPTION_WINDOW_SCREENSHOT                23
-#define COMP_DISPLAY_OPTION_RUN_WINDOW_SCREENSHOT_KEY        24
-#define COMP_DISPLAY_OPTION_WINDOW_MENU_BUTTON               25
-#define COMP_DISPLAY_OPTION_WINDOW_MENU_KEY                  26
-#define COMP_DISPLAY_OPTION_SHOW_DESKTOP_KEY                 27
-#define COMP_DISPLAY_OPTION_SHOW_DESKTOP_EDGE                28
-#define COMP_DISPLAY_OPTION_RAISE_ON_CLICK                   29
-#define COMP_DISPLAY_OPTION_AUDIBLE_BELL                     30
-#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_KEY      31
-#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_BUTTON   32
-#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_HORZ_KEY 33
-#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_VERT_KEY 34
-#define COMP_DISPLAY_OPTION_HIDE_SKIP_TASKBAR_WINDOWS        35
-#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_SHADED_KEY         36
-#define COMP_DISPLAY_OPTION_IGNORE_HINTS_WHEN_MAXIMIZED      37
-#define COMP_DISPLAY_OPTION_TERMINAL			     38
-#define COMP_DISPLAY_OPTION_RUN_TERMINAL_KEY		     39
-#define COMP_DISPLAY_OPTION_PING_DELAY			     40
-#define COMP_DISPLAY_OPTION_EDGE_DELAY                       41
-#define COMP_DISPLAY_OPTION_NUM				     42
+#define COMP_DISPLAY_OPTION_SLOW_ANIMATIONS_KEY              8
+#define COMP_DISPLAY_OPTION_RAISE_WINDOW_KEY                 9
+#define COMP_DISPLAY_OPTION_RAISE_WINDOW_BUTTON              10
+#define COMP_DISPLAY_OPTION_LOWER_WINDOW_KEY                 11
+#define COMP_DISPLAY_OPTION_LOWER_WINDOW_BUTTON              12
+#define COMP_DISPLAY_OPTION_UNMAXIMIZE_WINDOW_KEY            13
+#define COMP_DISPLAY_OPTION_MINIMIZE_WINDOW_KEY              14
+#define COMP_DISPLAY_OPTION_MINIMIZE_WINDOW_BUTTON           15
+#define COMP_DISPLAY_OPTION_MAXIMIZE_WINDOW_KEY              16
+#define COMP_DISPLAY_OPTION_MAXIMIZE_WINDOW_HORZ_KEY         17
+#define COMP_DISPLAY_OPTION_MAXIMIZE_WINDOW_VERT_KEY         18
+#define COMP_DISPLAY_OPTION_WINDOW_MENU_BUTTON               19
+#define COMP_DISPLAY_OPTION_WINDOW_MENU_KEY                  20
+#define COMP_DISPLAY_OPTION_SHOW_DESKTOP_KEY                 21
+#define COMP_DISPLAY_OPTION_SHOW_DESKTOP_EDGE                22
+#define COMP_DISPLAY_OPTION_RAISE_ON_CLICK                   23
+#define COMP_DISPLAY_OPTION_AUDIBLE_BELL                     24
+#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_KEY      25
+#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_BUTTON   26
+#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_HORZ_KEY 27
+#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_VERT_KEY 28
+#define COMP_DISPLAY_OPTION_HIDE_SKIP_TASKBAR_WINDOWS        29
+#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_SHADED_KEY         30
+#define COMP_DISPLAY_OPTION_IGNORE_HINTS_WHEN_MAXIMIZED      31
+#define COMP_DISPLAY_OPTION_PING_DELAY			     32
+#define COMP_DISPLAY_OPTION_EDGE_DELAY                       33
+#define COMP_DISPLAY_OPTION_NUM				     34
 
 typedef void (*HandleEventProc) (CompDisplay *display,
 				 XEvent	     *event);
@@ -1009,8 +1001,6 @@ struct _CompDisplay {
     Atom xBackgroundAtom[2];
 
     Atom toolkitActionAtom;
-    Atom toolkitActionMainMenuAtom;
-    Atom toolkitActionRunDialogAtom;
     Atom toolkitActionWindowMenuAtom;
     Atom toolkitActionForceQuitDialogAtom;