[gnome-mahjongg/arnaudb/wip/gtk4: 22/29] Use Control.

[Arnaud B. <arnaudb src gnome org>]

commit 7383b485ead5864be557c7c4eb82f8453cd16b14
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Fri Oct 9 17:14:05 2020 +0200

    Use Control.

 data/help-overlay.ui    | 14 +++++++-------
 src/gnome-mahjongg.vala | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/data/help-overlay.ui b/data/help-overlay.ui
index afc63dc..be5780e 100644
--- a/data/help-overlay.ui
+++ b/data/help-overlay.ui
@@ -14,7 +14,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;N</property>
+                <property name="accelerator">&lt;Control&gt;N</property>
                 <!-- Translators: Ctrl-N shortcut description in the Keyboard Shortcuts dialog, section 
"Main functions"; discard current game and start a new one -->
                 <property name="title" translatable="yes" context="shortcut window">Start a new 
game</property>
               </object>
@@ -22,7 +22,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;P Pause</property>
+                <property name="accelerator">&lt;Control&gt;P Pause</property>
                 <!-- Translators: Ctrl-P (or Pause) shortcut description in the Keyboard Shortcuts dialog, 
section "Main functions"; pause the current game -->
                 <property name="title" translatable="yes" context="shortcut window">Pause the game</property>
               </object>
@@ -30,7 +30,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;Z</property>
+                <property name="accelerator">&lt;Control&gt;Z</property>
                 <!-- Translators: Ctrl-Z shortcut description in the Keyboard Shortcuts dialog, section 
"Main functions"; undo last move (if any) in the current game -->
                 <property name="title" translatable="yes" context="shortcut window">Undo</property>
               </object>
@@ -38,7 +38,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;Shift&gt;&lt;Ctrl&gt;Z</property>
+                <property name="accelerator">&lt;Shift&gt;&lt;Control&gt;Z</property>
                 <!-- Translators: Shift-Ctrl-Z shortcut description in the Keyboard Shortcuts dialog, 
section "Main functions"; redo last undone move (if any) in the current game -->
                 <property name="title" translatable="yes" context="shortcut window">Redo</property>
               </object>
@@ -46,7 +46,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;H</property>
+                <property name="accelerator">&lt;Control&gt;H</property>
                 <!-- Translators: Ctrl-H shortcut description in the Keyboard Shortcuts dialog, section 
"Main functions"; highlight two matching tiles -->
                 <property name="title" translatable="yes" context="shortcut window">Show a hint</property>
               </object>
@@ -69,7 +69,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;Primary&gt;question</property>
+                <property name="accelerator">&lt;Control&gt;question</property>
                 <!-- Translators: Alt-? shortcut description in the Keyboard Shortcuts dialog, section 
"Generic"; show a window describing keyboard shortcuts -->
                 <property name="title" translatable="yes" context="shortcut window">Show Keyboard 
Shortcuts</property>
               </object>
@@ -93,7 +93,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;Q</property>
+                <property name="accelerator">&lt;Control&gt;Q</property>
                 <!-- Translators: Ctrl-Q shortcut description in the Keyboard Shortcuts dialog, section 
"Generic"; close the window and quit application -->
                 <property name="title" translatable="yes" context="shortcut window">Quit</property>
               </object>
diff --git a/src/gnome-mahjongg.vala b/src/gnome-mahjongg.vala
index 460ff85..d8c94de 100644
--- a/src/gnome-mahjongg.vala
+++ b/src/gnome-mahjongg.vala
@@ -66,15 +66,15 @@ public class Mahjongg : Gtk.Application
         base.startup ();
 
         add_action_entries (action_entries, this);
-        set_accels_for_action ("app.new-game",  {        "<Primary>n"       });
-        set_accels_for_action ("app.pause",     {        "<Primary>p",
+        set_accels_for_action ("app.new-game",  {        "<Control>n"       });
+        set_accels_for_action ("app.pause",     {        "<Control>p",
                                                                   "Pause"   });
-        set_accels_for_action ("app.hint",      {        "<Primary>h"       });
-        set_accels_for_action ("app.undo",      {        "<Primary>z"       });
-        set_accels_for_action ("app.redo",      { "<Shift><Primary>z"       });
+        set_accels_for_action ("app.hint",      {        "<Control>h"       });
+        set_accels_for_action ("app.undo",      {        "<Control>z"       });
+        set_accels_for_action ("app.redo",      { "<Shift><Control>z"       });
         set_accels_for_action ("app.help",      {                 "F1"      });
-        set_accels_for_action ("app.quit",      {        "<Primary>q",
-                                                         "<Primary>w"       });
+        set_accels_for_action ("app.quit",      {        "<Control>q",
+                                                         "<Control>w"       });
         set_accels_for_action ("app.hamburger", {                 "F10"     });
 
         settings = new GLib.Settings ("org.gnome.Mahjongg");