From 7295e3ca5b6ce5061666c2da4c339853f0d16efc Mon Sep 17 00:00:00 2001

From: Jordan Petridis <jordan@centricular.com>

Date: Sat, 10 Apr 2021 01:57:50 +0300

Subject: [PATCH] Revert "Revert "Revert the introduction of the amtk library""

This reverts commit 18369a6958664f10b68c9edb749dbd3af7cc731a.

amtk is now archived.

---

 .gitignore                     |   1 +

 README.md                      |   1 -

 flatpak/org.gnome.Devhelp.json |  45 ++++++

 flatpak/org.gnome.Devhelp.yml  |  45 ------

 meson.build                    |   2 +-

 po/POTFILES.in                 |   3 +

 src/dh-app.c                   | 255 ++++++++++-----------------------

 src/dh-app.h                   |   2 -

 src/dh-main.c                  |   3 -

 src/dh-window.c                | 255 ++++++---------------------------

 src/dh-window.ui               | 245 +++++++++++++++++++++++++++++++

 src/dh.gresource.xml           |   5 +

 src/help-overlay.ui            | 117 +++++++++++++++

 src/menus.ui                   |  58 ++++++++

 14 files changed, 599 insertions(+), 438 deletions(-)

 create mode 100644 flatpak/org.gnome.Devhelp.json

 delete mode 100644 flatpak/org.gnome.Devhelp.yml

 create mode 100644 src/dh-window.ui

 create mode 100644 src/help-overlay.ui

 create mode 100644 src/menus.ui

\ No newline at end of file

diff --git a/README.md b/README.md

index 6057f78b..2d83a3c2 100644

--- a/README.md

+++ b/README.md

@@ -1,54 +1,53 @@

 Devhelp

 =======

 The Devhelp web page:

 https://wiki.gnome.org/Apps/Devhelp

 Installation of the Devhelp Flatpak

 -----------------------------------

 - [Devhelp on Flathub](https://flathub.org/apps/details/org.gnome.Devhelp)

 How to contribute

 -----------------

 See the [HACKING](HACKING) file.

 Dependencies

 ------------

 - GLib

 - GTK

 - WebKitGTK

-- [Amtk](https://wiki.gnome.org/Projects/Amtk)

 - gsettings-desktop-schemas

 Description

 -----------

 Devhelp is a developer tool for browsing and searching API documentation.

 It provides an easy way to navigate through libraries and to search by

 function, struct, or macro.

 The documentation must be installed locally, so an internet connection is

 not needed to use Devhelp.

 Devhelp works natively with GTK-Doc, so the GTK and GNOME libraries are

 well supported. But other development platforms can be supported as well,

 as long as the API documentation is available in HTML and a `*.devhelp2`

 index file is generated.

 Devhelp integrates with other applications such as Glade, Builder or

 Anjuta, and plugins are available for different text editors (gedit, Vim,

 Emacs, Geany, …).

 Integration with other developer tools

 --------------------------------------

 Devhelp provides some command line options, such as `--search` and

 `--search-assistant`. A text editor plugin can for example launch the command

 `devhelp --search function_name` when a keyboard shortcut is pressed, with the

 `function_name` under the cursor.

 Devhelp also provides a shared library, to integrate the GTK widgets inside an

diff --git a/flatpak/org.gnome.Devhelp.json b/flatpak/org.gnome.Devhelp.json

new file mode 100644

index 00000000..a2d1372d

--- /dev/null

+++ b/flatpak/org.gnome.Devhelp.json

@@ -0,0 +1,45 @@

+{

+    "app-id" : "org.gnome.Devhelp",

+    "runtime" : "org.gnome.Sdk",

+    "runtime-version" : "master",

+    "sdk" : "org.gnome.Sdk",

+    "command" : "devhelp",

+    "tags" : [

+        "nightly"

+    ],

+    "desktop-file-name-prefix" : "(Nightly) ",

+    "finish-args" : [

+        "--share=ipc",

+        "--socket=x11",

+        "--socket=wayland",

+        "--device=dri",

+        "--filesystem=host:ro"

+    ],

+    "cleanup" : [

+        "/include",

+        "/lib/pkgconfig",

+        "/share/pkgconfig",

+        "share/aclocal",

+        "man",

+        "share/man",

+        "*.la",

+        "*.a"

+    ],

+    "modules" : [

+        {

+            "name" : "devhelp",

+            "buildsystem" : "meson",

+            "config-opts" : [

+                "-Dflatpak_build=true"

+            ],

+            "run-tests" : true,

+            "sources" : [

+                {

+                    "type" : "git",

+                    "url" : "https://gitlab.gnome.org/GNOME/devhelp.git",

+                    "branch" : "master"

+                }

+            ]

+        }

+    ]

+}

diff --git a/flatpak/org.gnome.Devhelp.yml b/flatpak/org.gnome.Devhelp.yml

deleted file mode 100644

index 49b838b7..00000000

--- a/flatpak/org.gnome.Devhelp.yml

+++ /dev/null

@@ -1,45 +0,0 @@

-app-id: org.gnome.Devhelp

-runtime: org.gnome.Sdk

-runtime-version: master

-sdk: org.gnome.Sdk

-command: devhelp

-tags:

-  - nightly

-desktop-file-name-prefix: "(Nightly) "

-

-finish-args:

-  # X11 + XShm access

-  - --share=ipc

-  - --socket=x11

-  # Wayland access

-  - --socket=wayland

-  # OpenGL for Webkit

-  - --device=dri

-  # We want full fs access to see the API docs installed by traditional Linux

-  # distro packages.

-  - --filesystem=host:ro

-

-build-options:

-  cflags: -O2 -g

-  cxxflags: -O2 -g

-

-cleanup:

-  - /share/man

-  - /lib/pkgconfig

-  - /include

-

-modules:

-  - name: amtk

-    buildsystem: meson

-    run-tests: true

-    sources:

-      - type: git

-        url: https://gitlab.gnome.org/GNOME/amtk.git

-

-  - name: devhelp

-    buildsystem: meson

-    config-opts: [ "-Dflatpak_build=true" ]

-    run-tests: true

-    sources:

-      - type: git

-        url: https://gitlab.gnome.org/GNOME/devhelp.git

diff --git a/meson.build b/meson.build

index bdd66056..d71d748d 100644

--- a/meson.build

+++ b/meson.build

@@ -35,61 +35,61 @@ LIBDEVHELP_API_VERSION_FULL = '3.0'

 #    changed since the last update, increment CURRENT and set REVISION

 #    to 0.

 # 3. If any exported functions or data have been added since the last

 #    public release, increment AGE.

 # 4. If any exported functions or data have been removed since the last

 #    public release, set AGE to 0.

 #

 # When incrementing the API version (usually for a new major package version),

 # set CURRENT, REVISION and AGE to 0 since it's like a new library.

 lt_current = 6

 lt_revision = 3

 lt_age = 0

 LIBDEVHELP_LT_VERSION = '@0@.@1@.@2@'.format(lt_current, lt_revision, lt_age)

 LIBDEVHELP_PUBLIC_DEPS = [

   dependency('gio-2.0', version: '>= 2.64'),

   dependency('gtk+-3.0', version: '>= 3.22'),

   dependency('webkit2gtk-4.0', version: '>= 2.26'),

 ]

 LIBDEVHELP_PRIVATE_DEPS = [

   dependency('gsettings-desktop-schemas'),

 ]

 LIBDEVHELP_DEPS = [

   LIBDEVHELP_PUBLIC_DEPS,

   LIBDEVHELP_PRIVATE_DEPS,

   meson.get_compiler('c').find_library('m'),

 ]

 DEVHELP_APP_DEPS = [

   LIBDEVHELP_DEPS,

-  dependency('amtk-5', version: '>= 5.0'),

+  dependency('gsettings-desktop-schemas'),

 ]

 # config.h

 config_data = configuration_data()

 GETTEXT_PACKAGE_NAME = meson.project_name()

 config_data.set_quoted('GETTEXT_PACKAGE', GETTEXT_PACKAGE_NAME)

 config_data.set_quoted('DATADIR', get_option('prefix') / get_option('datadir'))

 config_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))

 config_data.set_quoted('PACKAGE_VERSION', meson.project_version())

 config_data.set_quoted('LIBDEVHELP_API_VERSION', LIBDEVHELP_API_VERSION)

 config_data.set10('FLATPAK_BUILD', get_option('flatpak_build'))

 configure_file(

   output: 'config.h',

   configuration: config_data

 )

 # Misc

 # For #include <devhelp/something.h> or #include "config.h".

 ROOT_INCLUDE_DIR = include_directories('.')

 add_project_arguments(

   '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name()),

   language: 'c'

 )

 #####

 # CFLAGS

diff --git a/po/POTFILES.in b/po/POTFILES.in

index db463e9e..cd6e6ed8 100644

--- a/po/POTFILES.in

+++ b/po/POTFILES.in

@@ -15,30 +15,33 @@ devhelp/dh-book-manager.c

 devhelp/dh-book-tree.c

 devhelp/dh-completion.c

 devhelp/dh-error.c

 devhelp/dh-init.c

 devhelp/dh-keyword-model.c

 devhelp/dh-link.c

 devhelp/dh-notebook.c

 devhelp/dh-parser.c

 devhelp/dh-profile-builder.c

 devhelp/dh-profile.c

 devhelp/dh-search-bar.c

 devhelp/dh-search-context.c

 devhelp/dh-settings-builder.c

 devhelp/dh-settings.c

 devhelp/dh-sidebar.c

 devhelp/dh-tab.c

 devhelp/dh-tab-label.c

 devhelp/dh-util-lib.c

 devhelp/dh-web-view.c

 plugins/gedit-plugin/devhelp.plugin.desktop.in

 plugins/gedit-plugin/devhelp.py

 src/dh-app.c

 src/dh-assistant.c

 src/dh-assistant.ui

 src/dh-main.c

 src/dh-preferences.c

 src/dh-preferences.ui

 src/dh-settings-app.c

 src/dh-util-app.c

 src/dh-window.c

+src/dh-window.ui

+src/help-overlay.ui

+src/menus.ui

diff --git a/src/dh-app.c b/src/dh-app.c

index 9ceae7f0..da97158c 100644

--- a/src/dh-app.c

+++ b/src/dh-app.c

@@ -1,200 +1,48 @@

 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */

 /* SPDX-FileCopyrightText: 2002 CodeFactory AB

  * SPDX-FileCopyrightText: 2002 Mikael Hallendal <micke@imendio.com>

  * SPDX-FileCopyrightText: 2004-2008 Imendio AB

  * SPDX-FileCopyrightText: 2012 Aleksander Morgado <aleksander@gnu.org>

  * SPDX-FileCopyrightText: 2017, 2018 Sébastien Wilmet <swilmet@gnome.org>

  * SPDX-License-Identifier: GPL-3.0-or-later

  */

 #include "config.h"

 #include "dh-app.h"

 #include <glib/gi18n.h>

-#include <amtk/amtk.h>

 #include "dh-assistant.h"

 #include "dh-preferences.h"

 #include "dh-settings-app.h"

 #include "dh-util-app.h"

-struct _DhAppPrivate {

-        /* AmtkActionInfoStore for actions that are present in a menu. */

-        AmtkActionInfoStore *menu_action_info_store;

-};

-

-G_DEFINE_TYPE_WITH_PRIVATE (DhApp, dh_app, GTK_TYPE_APPLICATION);

-

-/* This function adds the AmtkActionInfo's for the GActions that are present in

- * a menu.

- */

-static void

-add_menu_action_infos (DhApp *app)

-{

-        const gchar *accels[] = {NULL, NULL, NULL, NULL};

-        AmtkActionInfo *action_info;

-

-        const AmtkActionInfoEntry entries[] = {

-                /* action, icon, label, accel, tooltip */

-

-                /* Actions related to the whole application */

-                { "app.new-window", NULL, N_("New _Window"), "<Control>n",

-                  N_("Open a new window") },

-                { "app.preferences", NULL, N_("_Preferences") },

-                { "win.shortcuts-window", NULL, N_("_Keyboard Shortcuts"), "<Control>question",

-                  N_("Show keyboard shortcuts") },

-                { "app.help", NULL, N_("_Help"), "F1",

-                  N_("Show help") },

-                { "app.about", NULL, N_("_About Devhelp") },

-                { "app.quit", NULL, N_("_Quit"), "<Control>q",

-                  N_("Close all windows (quit the application)") },

-

-                /* Actions related to the current main window */

-                { "win.show-sidebar", NULL, N_("_Side Panel"), "F9",

-                  N_("Toggle side panel visibility") },

-                { "win.print", NULL, N_("_Print"), "<Control>p" },

-                { "win.find", NULL, N_("_Find"), "<Control>f",

-                  N_("Find in current page") },

-                { "win.zoom-in", NULL, N_("_Larger Text"), NULL,

-                  N_("Larger text") },

-                { "win.zoom-out", NULL, N_("S_maller Text"), NULL,

-                  N_("Smaller text") },

-                { "win.zoom-default", NULL, N_("_Normal Size"), NULL,

-                  N_("Normal size") },

-                { NULL }

-        };

-

-        g_assert (app->priv->menu_action_info_store == NULL);

-        app->priv->menu_action_info_store = amtk_action_info_store_new ();

-

-        amtk_action_info_store_add_entries (app->priv->menu_action_info_store,

-                                            entries, -1,

-                                            GETTEXT_PACKAGE);

-

-        /* The same as in Epiphany. */

-        accels[0] = "<Control>minus";

-        accels[1] = "<Control>KP_Subtract";

-        action_info = amtk_action_info_store_lookup (app->priv->menu_action_info_store, "win.zoom-out");

-        amtk_action_info_set_accels (action_info, accels);

-

-        /* The same as in Epiphany. */

-        accels[0] = "<Control>0";

-        accels[1] = "<Control>KP_0";

-        action_info = amtk_action_info_store_lookup (app->priv->menu_action_info_store, "win.zoom-default");

-        amtk_action_info_set_accels (action_info, accels);

-

-        /* For "<Control>equal": Epiphany also has this keyboard shortcut for

-         * zoom-in. On keyboards the = and + are usually on the same key, but +

-         * is less convenient to type because Shift must be pressed too.

-         * Apparently it's usual on Windows to press Ctrl+= to zoom in.

-         * https://bugzilla.gnome.org/show_bug.cgi?id=743704

-         */

-        accels[0] = "<Control>plus";

-        accels[1] = "<Control>equal";

-        accels[2] = "<Control>KP_Add";

-        action_info = amtk_action_info_store_lookup (app->priv->menu_action_info_store, "win.zoom-in");

-        amtk_action_info_set_accels (action_info, accels);

-

-        amtk_action_info_store_set_all_accels_to_app (app->priv->menu_action_info_store,

-                                                      GTK_APPLICATION (app));

-}

-

-/* This function adds the AmtkActionInfo's for other GActions (GActions that are

- * not present in a menu).

- */

-static void

-add_other_action_infos (DhApp *app)

-{

-        AmtkActionInfoStore *store;

-        AmtkActionInfo *action_info;

-        const gchar *accels[] = {NULL, NULL, NULL, NULL};

-

-        const AmtkActionInfoEntry entries[] = {

-                /* action, icon, label, accel, tooltip */

-                { "win.new-tab", NULL, NULL, "<Control>t", N_("Open a new tab") },

-                { "win.close-tab", NULL, NULL, "<Control>w", N_("Close the current tab") },

-                { "win.go-back", NULL, NULL, NULL, N_("Go back") },

-                { "win.go-forward", NULL, NULL, NULL, N_("Go forward") },

-                { "win.focus-search", NULL, NULL, NULL, N_("Focus global search") },

-                { NULL }

-        };

-

-        store = amtk_action_info_store_new ();

-        amtk_action_info_store_add_entries (store, entries, -1, GETTEXT_PACKAGE);

-

-        accels[0] = "<Alt>Left";

-        accels[1] = "Back";

-        action_info = amtk_action_info_store_lookup (store, "win.go-back");

-        amtk_action_info_set_accels (action_info, accels);

-

-        accels[0] = "<Alt>Right";

-        accels[1] = "Forward";

-        action_info = amtk_action_info_store_lookup (store, "win.go-forward");

-        amtk_action_info_set_accels (action_info, accels);

-

-        accels[0] = "<Control>k";

-        accels[1] = "<Control>s";

-        accels[2] = "<Control>l";

-        action_info = amtk_action_info_store_lookup (store, "win.focus-search");

-        amtk_action_info_set_accels (action_info, accels);

-

-        amtk_action_info_store_set_all_accels_to_app (store, GTK_APPLICATION (app));

-        g_object_unref (store);

-}

-

-/* This function adds the AmtkActionInfo's for things that have no related

- * GActions.

- */

-static void

-add_no_gaction_action_infos (void)

-{

-        AmtkActionInfoStore *store;

-

-        const AmtkActionInfoEntry entries[] = {

-                /* action, icon, label, accel, tooltip */

-                { "no-gaction-open-menu", NULL, NULL, "F10", N_("Open the menu") },

-                { "no-gaction-prev-tab", NULL, NULL, "<Control>Page_Up", N_("Previous tab") },

-                { "no-gaction-next-tab", NULL, NULL, "<Control>Page_Down", N_("Next tab") },

-                { NULL }

-        };

-

-        store = amtk_action_info_store_new ();

-        amtk_action_info_store_add_entries (store, entries, -1, GETTEXT_PACKAGE);

-        g_object_unref (store);

-}

-

-static void

-add_action_infos (DhApp *app)

-{

-        add_menu_action_infos (app);

-        add_other_action_infos (app);

-        add_no_gaction_action_infos ();

-}

+G_DEFINE_TYPE (DhApp, dh_app, GTK_TYPE_APPLICATION);

 static DhAssistant *

 get_active_assistant_window (DhApp *app)

 {

         GList *windows;

         GList *l;

         windows = gtk_application_get_windows (GTK_APPLICATION (app));

         for (l = windows; l != NULL; l = l->next) {

                 GtkWindow *cur_window = GTK_WINDOW (l->data);

                 if (DH_IS_ASSISTANT (cur_window))

                         return DH_ASSISTANT (cur_window);

         }

         return NULL;

 }

 static void

 save_active_main_window_gsettings (DhApp *app)

 {

         DhWindow *active_window;

         DhSettingsApp *settings;

         active_window = dh_app_get_active_main_window (app, FALSE);

         if (active_window == NULL)

                 return;

         settings = dh_settings_app_get_singleton ();

@@ -202,62 +50,60 @@ save_active_main_window_gsettings (DhApp *app)

                                       dh_settings_app_peek_window_settings (settings));

 }

 static void

 save_active_assistant_window_gsettings (DhApp *app)

 {

         DhAssistant *active_assistant;

         DhSettingsApp *settings;

         active_assistant = get_active_assistant_window (app);

         if (active_assistant == NULL)

                 return;

         settings = dh_settings_app_get_singleton ();

         dh_util_window_settings_save (GTK_WINDOW (active_assistant),

                                       dh_settings_app_peek_assistant_settings (settings));

 }

 static void

 new_window_cb (GSimpleAction *action,

                GVariant      *parameter,

                gpointer       user_data)

 {

         DhApp *app = DH_APP (user_data);

         GtkWidget *new_window;

         save_active_main_window_gsettings (app);

         new_window = dh_window_new (GTK_APPLICATION (app));

         gtk_widget_show_all (new_window);

-

-        amtk_action_info_store_check_all_used (app->priv->menu_action_info_store);

 }

 static void

 preferences_cb (GSimpleAction *action,

                 GVariant      *parameter,

                 gpointer       user_data)

 {

         DhApp *app = DH_APP (user_data);

         GtkWindow *parent_window;

         parent_window = (GtkWindow *) dh_app_get_active_main_window (app, FALSE);

         dh_preferences_show_dialog (parent_window);

 }

 static void

 help_cb (GSimpleAction *action,

          GVariant      *parameter,

          gpointer       user_data)

 {

         DhApp *app = DH_APP (user_data);

         GtkWindow *window;

         GError *error = NULL;

         window = (GtkWindow *) dh_app_get_active_main_window (app, FALSE);

         gtk_show_uri_on_window (window, "help:devhelp", GDK_CURRENT_TIME, &error);

         if (error != NULL) {

                 g_warning ("Failed to open the documentation: %s", error->message);

                 g_clear_error (&error);

@@ -364,127 +210,195 @@ raise_cb (GSimpleAction *action,

           GVariant      *parameter,

           gpointer       user_data)

 {

         DhApp *app = DH_APP (user_data);

         GtkWindow *window;

         window = gtk_application_get_active_window (GTK_APPLICATION (app));

         if (window == NULL)

                 window = (GtkWindow *) dh_app_get_active_main_window (app, TRUE);

         gtk_window_present (window);

 }

 static void

 add_action_entries (DhApp *app)

 {

         const GActionEntry app_entries[] = {

                 /* General actions */

                 { "new-window", new_window_cb },

                 { "preferences", preferences_cb },

                 { "help", help_cb },

                 { "about", about_cb },

                 { "quit", quit_cb },

                 /* Additional commandline-specific actions */

                 { "search", search_cb, "s" },

                 { "search-assistant", search_assistant_cb, "s" },

                 { "raise", raise_cb },

         };

-        amtk_action_map_add_action_entries_check_dups (G_ACTION_MAP (app),

-                                                       app_entries,

-                                                       G_N_ELEMENTS (app_entries),

-                                                       app);

+        g_action_map_add_action_entries (G_ACTION_MAP (app),

+                                         app_entries,

+                                         G_N_ELEMENTS (app_entries),

+                                         app);

 }

 static void

 setup_go_to_tab_accelerators (GtkApplication *app)

 {

         const gchar *accels[] = {NULL, NULL};

         gint key_num;

         for (key_num = 1; key_num <= 9; key_num++) {

                 gchar *accel;

                 gchar *detailed_action_name;

                 accel = g_strdup_printf ("<Alt>%d", key_num);

                 accels[0] = accel;

                 detailed_action_name = g_strdup_printf ("win.go-to-tab(uint16 %d)", key_num - 1);

                 gtk_application_set_accels_for_action (app, detailed_action_name, accels);

                 g_free (accel);

                 g_free (detailed_action_name);

         }

         /* On a typical keyboard the 0 is after 9, so it's the equivalent of 10

          * (9 starting from 0).

          */

         accels[0] = "<Alt>0";

         gtk_application_set_accels_for_action (app, "win.go-to-tab(uint16 9)", accels);

 }

 static void

-setup_additional_accelerators (GtkApplication *app)

+setup_accelerators (GtkApplication *app)

 {

-        const gchar *accels[] = {NULL, NULL};

+        const gchar *accels[] = {NULL, NULL, NULL, NULL};

         setup_go_to_tab_accelerators (app);

+        accels[0] = "<Control>0";

+        gtk_application_set_accels_for_action (app, "win.zoom-default", accels);

+

+        accels[0] = "<Control>minus";

+        gtk_application_set_accels_for_action (app, "win.zoom-out", accels);

+

+        /* For "<Control>equal": Epiphany also has this keyboard shortcut for

+         * zoom-in. On keyboards the = and + are usually on the same key, but +

+         * is less convenient to type because Shift must be pressed too.

+         * Apparently it's usual on Windows to press Ctrl+= to zoom in.

+         * https://bugzilla.gnome.org/show_bug.cgi?id=743704

+         */

+        accels[0] = "<Control>plus";

+        accels[1] = "<Control>equal";

+        gtk_application_set_accels_for_action (app, "win.zoom-in", accels);

+        accels[1] = NULL;

+

+        accels[0] = "<Control>f";

+        gtk_application_set_accels_for_action (app, "win.find", accels);

+

         accels[0] = "<Control>c";

         gtk_application_set_accels_for_action (app, "win.copy", accels);

+        accels[0] = "<Control>p";

+        gtk_application_set_accels_for_action (app, "win.print", accels);

+

+        accels[0] = "<Control>t";

+        gtk_application_set_accels_for_action (app, "win.new-tab", accels);

+

+        accels[0] = "<Control>n";

+        gtk_application_set_accels_for_action (app, "app.new-window", accels);

+

         accels[0] = "<Control>Page_Down";

         gtk_application_set_accels_for_action (app, "win.next-tab", accels);

         accels[0] = "<Control>Page_Up";

         gtk_application_set_accels_for_action (app, "win.prev-tab", accels);

+        accels[0] = "<Control>w";

+        gtk_application_set_accels_for_action (app, "win.close-tab", accels);

+

+        accels[0] = "<Control>q";

+        gtk_application_set_accels_for_action (app, "app.quit", accels);

+

+        accels[0] = "F1";

+        gtk_application_set_accels_for_action (app, "app.help", accels);

+

+        accels[0] = "F9";

+        gtk_application_set_accels_for_action (app, "win.show-sidebar", accels);

+

         accels[0] = "F10";

         gtk_application_set_accels_for_action (app, "win.show-window-menu", accels);

+

+        accels[0] = "<Alt>Right";

+        accels[1] = "Forward";

+        gtk_application_set_accels_for_action (app, "win.go-forward", accels);

+

+        accels[0] = "<Alt>Left";

+        accels[1] = "Back";

+        gtk_application_set_accels_for_action (app, "win.go-back", accels);

+

+        accels[0] = "<Control>k";

+        accels[1] = "<Control>s";

+        accels[2] = "<Control>l";

+        gtk_application_set_accels_for_action (app, "win.focus-search", accels);

+}

+

+static void

+set_app_menu_if_needed (GtkApplication *app)

+{

+        GMenu *manual_app_menu;

+

+        manual_app_menu = gtk_application_get_menu_by_id (app, "manual-app-menu");

+

+        /* Have the g_return in all cases, to catch problems in all cases. */