[gnome-terminal] Revert "window: Workaround mismatch in GAction and GtkAction accelerators"

[Christian Persch <chpe src gnome org>]

commit e776ebc9f34f5c05afbd884a25bdcfa09b8140eb
Author: Christian Persch <chpe gnome org>
Date:   Fri Apr 25 09:07:00 2014 +0200

    Revert "window: Workaround mismatch in GAction and GtkAction accelerators"
    
    This reverts commit fd5399bd4ac81d9a57e55c5b8411a9217ee0355b.

 src/terminal-window.c |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/terminal-window.c b/src/terminal-window.c
index e579a43..aac8de7 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -2357,10 +2357,10 @@ terminal_window_init (TerminalWindow *window)
       { "NotebookPopup", NULL, "" },
 
       /* File menu */
-      { "FileNewWindow", STOCK_NEW_WINDOW, N_("Open _Terminal"), NULL,
+      { "FileNewWindow", STOCK_NEW_WINDOW, N_("Open _Terminal"), "<shift><control>N",
         NULL,
         G_CALLBACK (file_new_terminal_callback) },
-      { "FileNewTab", STOCK_NEW_TAB, N_("Open Ta_b"), NULL,
+      { "FileNewTab", STOCK_NEW_TAB, N_("Open Ta_b"), "<shift><control>T",
         NULL,
         G_CALLBACK (file_new_terminal_callback) },
       { "FileNewTerminal", STOCK_NEW_TAB, N_("Open _Terminal"), NULL,
@@ -2372,18 +2372,18 @@ terminal_window_init (TerminalWindow *window)
       { "FileSaveContents", "document-save", N_("_Save Contents"), "",
         NULL,
         G_CALLBACK (file_save_contents_callback) },
-      { "FileCloseTab", "window-close", N_("C_lose Terminal"), NULL,
+      { "FileCloseTab", "window-close", N_("C_lose Terminal"), "<shift><control>W",
         NULL,
         G_CALLBACK (file_close_tab_callback) },
-      { "FileCloseWindow", "window-close", N_("_Close All Terminals"), NULL,
+      { "FileCloseWindow", "window-close", N_("_Close All Terminals"), "<shift><control>Q",
         NULL,
         G_CALLBACK (file_close_window_callback) },
 
       /* Edit menu */
-      { "EditCopy", "edit-copy", N_("Copy"), NULL,
+      { "EditCopy", "edit-copy", N_("Copy"), "<shift><control>C",
         NULL,
         G_CALLBACK (edit_copy_callback) },
-      { "EditPaste", "edit-paste", N_("Paste"), NULL,
+      { "EditPaste", "edit-paste", N_("Paste"), "<shift><control>V",
         NULL,
         G_CALLBACK (edit_paste_callback) },
       { "EditPasteURIPaths", "edit-paste", N_("Paste _Filenames"), "",
@@ -2400,27 +2400,27 @@ terminal_window_init (TerminalWindow *window)
         G_CALLBACK (edit_current_profile_callback) },
 
       /* View menu */
-      { "ViewZoomIn", "zoom-in", N_("Zoom In"), NULL,
+      { "ViewZoomIn", "zoom-in", N_("Zoom In"), "<control>plus",
         NULL,
         G_CALLBACK (view_zoom_in_callback) },
-      { "ViewZoomOut", "zoom-out", N_("Zoom Out"), NULL,
+      { "ViewZoomOut", "zoom-out", N_("Zoom Out"), "<control>minus",
         NULL,
         G_CALLBACK (view_zoom_out_callback) },
-      { "ViewZoom100", "zoom-original", N_("Normal Size"), NULL,
+      { "ViewZoom100", "zoom-original", N_("Normal Size"), "<control>0",
         NULL,
         G_CALLBACK (view_zoom_normal_callback) },
 
       /* Search menu */
-      { "SearchFind", "edit-find", N_("_Find…"), NULL,
+      { "SearchFind", "edit-find", N_("_Find…"), "<shift><control>F",
        NULL,
        G_CALLBACK (search_find_callback) },
-      { "SearchFindNext", NULL, N_("Find Ne_xt"), NULL,
+      { "SearchFindNext", NULL, N_("Find Ne_xt"), "<shift><control>G",
        NULL,
        G_CALLBACK (search_find_next_callback) },
-      { "SearchFindPrevious", NULL, N_("Find Pre_vious"), NULL,
+      { "SearchFindPrevious", NULL, N_("Find Pre_vious"), "<shift><control>H",
        NULL,
        G_CALLBACK (search_find_prev_callback) },
-      { "SearchClearHighlight", NULL, N_("_Clear Highlight"), NULL,
+      { "SearchClearHighlight", NULL, N_("_Clear Highlight"), "<shift><control>J",
        NULL,
        G_CALLBACK (search_clear_highlight_callback) },
 #if 0
@@ -2448,16 +2448,16 @@ terminal_window_init (TerminalWindow *window)
         G_CALLBACK (terminal_add_encoding_callback) },
 
       /* Tabs menu */
-      { "TabsPrevious", NULL, N_("_Previous Terminal"), NULL,
+      { "TabsPrevious", NULL, N_("_Previous Terminal"), "<control>Page_Up",
         NULL,
         G_CALLBACK (tabs_next_or_previous_tab_cb) },
-      { "TabsNext", NULL, N_("_Next Terminal"), NULL,
+      { "TabsNext", NULL, N_("_Next Terminal"), "<control>Page_Down",
         NULL,
         G_CALLBACK (tabs_next_or_previous_tab_cb) },
-      { "TabsMoveLeft", NULL, N_("Move Terminal _Left"), NULL,
+      { "TabsMoveLeft", NULL, N_("Move Terminal _Left"), "<shift><control>Page_Up",
         NULL,
         G_CALLBACK (tabs_move_left_callback) },
-      { "TabsMoveRight", NULL, N_("Move Terminal _Right"), NULL,
+      { "TabsMoveRight", NULL, N_("Move Terminal _Right"), "<shift><control>Page_Down",
         NULL,
         G_CALLBACK (tabs_move_right_callback) },
       { "TabsDetach", NULL, N_("_Detach Terminal"), NULL,
@@ -2465,7 +2465,7 @@ terminal_window_init (TerminalWindow *window)
         G_CALLBACK (tabs_detach_tab_callback) },
 
       /* Help menu */
-      { "HelpContents", "help-browser", N_("_Contents"), NULL,
+      { "HelpContents", "help-browser", N_("_Contents"), "F1",
         NULL,
         G_CALLBACK (help_contents_callback) },
       { "HelpAbout", "help-about", N_("_About"), NULL,