[gnome-mahjongg/arnaudb/wip/gtk4: 22/24] Use <Control>.

[Arnaud B. <arnaudb src gnome org>]

commit 92ca1fcd15beea16b6d6588df98e0d39995c8cc2
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Tue Apr 7 08:40:55 2020 +0200

    Use <Control>.

 data/help-overlay.ui    | 12 ++++++------
 src/gnome-mahjongg.vala | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/data/help-overlay.ui b/data/help-overlay.ui
index a986caa..f443a9e 100644
--- a/data/help-overlay.ui
+++ b/data/help-overlay.ui
@@ -13,7 +13,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>
                 <property name="title" translatable="yes" context="shortcut window">Start a new 
game</property>
               </object>
             </child>
@@ -27,14 +27,14 @@
             <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>
                 <property name="title" translatable="yes" context="shortcut window">Undo</property>
               </object>
             </child>
             <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>
                 <property name="title" translatable="yes" context="shortcut window">Redo</property>
               </object>
             </child>
@@ -48,7 +48,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>
                 <property name="title" translatable="yes" context="shortcut window">Quit</property>
               </object>
             </child>
@@ -61,7 +61,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>
                 <property name="title" translatable="yes" context="shortcut window">Show a hint</property>
               </object>
             </child>
@@ -75,7 +75,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;Primary&gt;question &lt;Primary&gt;F1</property>
+                <property name="accelerator">&lt;Control&gt;question &lt;Control&gt;F1</property>
                 <property name="title" translatable="yes" context="shortcut window">Show Keyboard 
Shortcuts</property>
               </object>
             </child>
diff --git a/src/gnome-mahjongg.vala b/src/gnome-mahjongg.vala
index 7e4dc73..ded7d99 100644
--- a/src/gnome-mahjongg.vala
+++ b/src/gnome-mahjongg.vala
@@ -64,13 +64,16 @@ 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", {"Pause"});
-        set_accels_for_action ("app.hint", {"<Primary>h"});
-        set_accels_for_action ("app.undo", {"<Primary>z"});
-        set_accels_for_action ("app.redo", {"<Primary><Shift>z"});
-        set_accels_for_action ("app.help", {"F1"});
-        set_accels_for_action ("app.quit", {"<Primary>q", "<Primary>w"});
+        set_accels_for_action ("app.new-game",  {        "<Control>n"       });
+        set_accels_for_action ("app.pause",     {                 "Pause",
+                                                         "<Control>p"       });
+        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",      {        "<Control>q",
+                                                  "<Shift><Control>q",
+                                                         "<Control>w"       });
 
         settings = new GLib.Settings ("org.gnome.Mahjongg");