[evolution] Bug 770141 - Remove Quick Reference PDF

[Milan Crha <mcrha src gnome org>]

commit 74469b0cbe3dd62743d757319e03c0764eac5ab1
Author: Andre Klapper <a9016009 gmx de>
Date:   Tue Jul 10 09:33:20 2018 +0200

    Bug 770141 - Remove Quick Reference PDF

 README.translators                 |   4 +-
 data/ui/evolution-shell.ui         |   1 -
 help/CMakeLists.txt                |   2 -
 help/quickref/C/quickref.pdf       | Bin 34236 -> 0 bytes
 help/quickref/C/quickref.tex       | 116 --------------
 help/quickref/CMakeLists.txt       |   9 --
 help/quickref/ca/quickref.pdf      | Bin 34908 -> 0 bytes
 help/quickref/ca/quickref.tex      | 116 --------------
 help/quickref/cs/quickref.pdf      | Bin 35383 -> 0 bytes
 help/quickref/cs/quickref.tex      | 117 ---------------
 help/quickref/de/quickref.pdf      | Bin 34875 -> 0 bytes
 help/quickref/de/quickref.tex      | 119 ---------------
 help/quickref/es/quickref.pdf      | Bin 34255 -> 0 bytes
 help/quickref/es/quickref.tex      | 116 --------------
 help/quickref/evolution-logo.eps   | 300 -------------------------------------
 help/quickref/fr/quickref.pdf      | Bin 35535 -> 0 bytes
 help/quickref/fr/quickref.tex      | 119 ---------------
 help/quickref/hu/quickref.pdf      | Bin 36307 -> 0 bytes
 help/quickref/hu/quickref.tex      | 116 --------------
 help/quickref/it/quickref.pdf      | Bin 33539 -> 0 bytes
 help/quickref/it/quickref.tex      | 116 --------------
 help/quickref/oc/quickref.pdf      | Bin 35370 -> 0 bytes
 help/quickref/oc/quickref.tex      | 119 ---------------
 help/quickref/pl/quickref.pdf      | Bin 38047 -> 0 bytes
 help/quickref/pl/quickref.tex      | 118 ---------------
 help/quickref/pt/quickref.pdf      | Bin 34909 -> 0 bytes
 help/quickref/pt/quickref.tex      | 116 --------------
 help/quickref/sq/quickref.pdf      | Bin 34872 -> 0 bytes
 help/quickref/sq/quickref.tex      | 116 --------------
 help/quickref/sv/quickref.pdf      | Bin 34885 -> 0 bytes
 help/quickref/sv/quickref.tex      | 116 --------------
 src/shell/e-shell-utils.c          |  66 --------
 src/shell/e-shell-utils.h          |   4 -
 src/shell/e-shell-window-actions.c |  25 ----
 src/shell/e-shell-window-actions.h |   2 -
 src/shell/e-shell.c                |   5 -
 36 files changed, 1 insertion(+), 1937 deletions(-)
---
diff --git a/README.translators b/README.translators
index 98eaef0148..5e0faabfdf 100644
--- a/README.translators
+++ b/README.translators
@@ -6,6 +6,4 @@ evolution/mail/default/C/Inbox and can be translated by translating the
 message in the file and also putting it in a locale specific dir, ie
 evolution/mail/default/fr/Inbox.  The file name 'Inbox' should not be
 changed, as this is an internally defined string (the name in the
-folder list will still be translated though). The content of the Quick
-Reference in the "Help" menu can also be translated, see 
-https://bugzilla.gnome.org/show_bug.cgi?id=307856#c3 for a how-to.
+folder list will still be translated though).
\ No newline at end of file
diff --git a/data/ui/evolution-shell.ui b/data/ui/evolution-shell.ui
index 4d30b80b9f..c2face2d43 100644
--- a/data/ui/evolution-shell.ui
+++ b/data/ui/evolution-shell.ui
@@ -76,7 +76,6 @@
     </menu>
     <menu action='help-menu'>
       <menuitem action='contents'/>
-      <menuitem action='quick-reference'/>
       <separator/>
       <menuitem action='submit-bug'/>
       <separator/>
diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt
index 24d6080c06..5c32df2b7a 100644
--- a/help/CMakeLists.txt
+++ b/help/CMakeLists.txt
@@ -321,5 +321,3 @@ endforeach(_file)
 install(FILES ${cinstalled}
        DESTINATION ${SHARE_INSTALL_PREFIX}/help/C/${HELP_ID}/${HELP_FIGURES_DIR}
 )
-
-add_subdirectory(quickref)
diff --git a/src/shell/e-shell-utils.c b/src/shell/e-shell-utils.c
index 70829ddbe2..d2c104095b 100644
--- a/src/shell/e-shell-utils.c
+++ b/src/shell/e-shell-utils.c
@@ -314,72 +314,6 @@ e_shell_utils_run_preferences (EShell *shell)
        }
 }
 
-static gboolean
-shell_utils_manage_quick_reference (EShell *shell,
-                                   gboolean only_test)
-{
-       const gchar * const *language_names;
-       gboolean app_launched = FALSE;
-       gboolean found_any = FALSE;
-
-       language_names = g_get_language_names ();
-       while (*language_names != NULL && !app_launched) {
-               const gchar *language = *language_names++;
-               gchar *filename;
-
-               /* This must be a valid language AND a language with
-                * no encoding suffix.  The next language should have
-                * no encoding suffix. */
-               if (language == NULL || strchr (language, '.') != NULL)
-                       continue;
-
-               filename = g_build_filename (
-                       EVOLUTION_HELPDIR, "quickref",
-                       language, "quickref.pdf", NULL);
-
-               if (g_file_test (filename, G_FILE_TEST_EXISTS)) {
-                       found_any = TRUE;
-
-                       if (!only_test) {
-                               GFile *file;
-                               gchar *uri;
-                               GError *error = NULL;
-
-                               file = g_file_new_for_path (filename);
-                               uri = g_file_get_uri (file);
-
-                               app_launched = g_app_info_launch_default_for_uri (
-                                       uri, NULL, &error);
-
-                               if (error != NULL) {
-                                       /* FIXME Show an error dialog. */
-                                       g_warning ("%s", error->message);
-                                       g_error_free (error);
-                               }
-
-                               g_object_unref (file);
-                               g_free (uri);
-                       }
-               }
-
-               g_free (filename);
-       }
-
-       return found_any;
-}
-
-gboolean
-e_shell_utils_is_quick_reference_available (EShell *shell)
-{
-       return shell_utils_manage_quick_reference (shell, TRUE);
-}
-
-void
-e_shell_utils_run_quick_reference (EShell *shell)
-{
-       shell_utils_manage_quick_reference (shell, FALSE);
-}
-
 void
 e_shell_utils_run_help_about (EShell *shell)
 {
diff --git a/src/shell/e-shell-utils.h b/src/shell/e-shell-utils.h
index 5cfe98a0b8..7564b559c2 100644
--- a/src/shell/e-shell-utils.h
+++ b/src/shell/e-shell-utils.h
@@ -41,10 +41,6 @@ guint                e_shell_utils_import_uris       (EShell *shell,
                                                 const gchar * const *uris);
 
 void           e_shell_utils_run_preferences   (EShell *shell);
-gboolean       e_shell_utils_is_quick_reference_available
-                                               (EShell *shell);
-void           e_shell_utils_run_quick_reference
-                                               (EShell *shell);
 void           e_shell_utils_run_help_about    (EShell *shell);
 void           e_shell_utils_run_help_contents (EShell *shell);
 EAlertSink *   e_shell_utils_find_alternate_alert_sink
diff --git a/src/shell/e-shell-window-actions.c b/src/shell/e-shell-window-actions.c
index b4d7d45d30..068a0a9dda 100644
--- a/src/shell/e-shell-window-actions.c
+++ b/src/shell/e-shell-window-actions.c
@@ -320,22 +320,6 @@ action_preferences_cb (GtkAction *action,
        e_shell_utils_run_preferences (e_shell_window_get_shell (shell_window));
 }
 
-/**
- * E_SHELL_WINDOW_ACTION_QUICK_REFERENCE:
- * @window: an #EShellWindow
- *
- * Activation of this action opens a printable table of useful shortcut
- * keys for this application.
- *
- * Main menu item: Help -> Quick Reference
- **/
-static void
-action_quick_reference_cb (GtkAction *action,
-                           EShellWindow *shell_window)
-{
-       e_shell_utils_run_quick_reference (e_shell_window_get_shell (shell_window));
-}
-
 /**
  * E_SHELL_WINDOW_ACTION_QUIT:
  * @window: an #EShellWindow
@@ -889,13 +873,6 @@ static GtkActionEntry shell_entries[] = {
          N_("Configure Evolution"),
          G_CALLBACK (action_preferences_cb) },
 
-       { "quick-reference",
-         NULL,
-         N_("_Quick Reference"),
-         NULL,
-         N_("Show Evolution’s shortcut keys"),
-         G_CALLBACK (action_quick_reference_cb) },
-
        { "quit",
          "application-exit",
          N_("_Quit"),
@@ -1315,8 +1292,6 @@ e_shell_window_actions_init (EShellWindow *shell_window)
        /* Fine tuning. */
 
        gtk_action_set_sensitive (ACTION (SEARCH_QUICK), FALSE);
-       gtk_action_set_visible (ACTION (QUICK_REFERENCE),
-               e_shell_utils_is_quick_reference_available (e_shell_window_get_shell (shell_window)));
 
        e_binding_bind_property (
                shell_window, "menubar-visible",
diff --git a/src/shell/e-shell-window-actions.h b/src/shell/e-shell-window-actions.h
index 592e3183a1..534f6601ab 100644
--- a/src/shell/e-shell-window-actions.h
+++ b/src/shell/e-shell-window-actions.h
@@ -58,8 +58,6 @@
        E_SHELL_WINDOW_ACTION ((window), "paste-clipboard")
 #define E_SHELL_WINDOW_ACTION_PREFERENCES(window) \
        E_SHELL_WINDOW_ACTION ((window), "preferences")
-#define E_SHELL_WINDOW_ACTION_QUICK_REFERENCE(window) \
-       E_SHELL_WINDOW_ACTION ((window), "quick-reference")
 #define E_SHELL_WINDOW_ACTION_QUIT(window) \
        E_SHELL_WINDOW_ACTION ((window), "quit")
 #define E_SHELL_WINDOW_ACTION_SEARCH_ADVANCED(window) \
diff --git a/src/shell/e-shell.c b/src/shell/e-shell.c
index 9d79f2444e..f86b308851 100644
--- a/src/shell/e-shell.c
+++ b/src/shell/e-shell.c
@@ -1266,8 +1266,6 @@ shell_app_menu_activate_cb (GSimpleAction *action,
                shell_action_new_window_cb (action, parameter, shell);
        } else if (g_str_equal (name, "preferences")) {
                e_shell_utils_run_preferences (shell);
-       } else if (g_str_equal (name, "quick-reference")) {
-               e_shell_utils_run_quick_reference (shell);
        } else if (g_str_equal (name, "help")) {
                e_shell_utils_run_help_contents (shell);
        } else if (g_str_equal (name, "about")) {
@@ -1283,7 +1281,6 @@ shell_create_app_menu (GtkApplication *application)
        const GActionEntry actions[] = {
                { "new-window", shell_app_menu_activate_cb, NULL, NULL, NULL },
                { "preferences", shell_app_menu_activate_cb, NULL, NULL, NULL },
-               { "quick-reference", shell_app_menu_activate_cb, NULL, NULL, NULL },
                { "help", shell_app_menu_activate_cb, NULL, NULL, NULL },
                { "about", shell_app_menu_activate_cb, NULL, NULL, NULL }
        };
@@ -1304,8 +1301,6 @@ shell_create_app_menu (GtkApplication *application)
        g_object_unref (section);
 
        section = g_menu_new ();
-       if (e_shell_utils_is_quick_reference_available (E_SHELL (application)))
-               g_menu_append (section, _("Quick _Reference"), "app.quick-reference");
        g_menu_append (section, _("_Help"), "app.help");
        g_menu_append (section, _("_About"), "app.about");
        g_menu_append (section, _("_Quit"), "app.quit");