[gnome-applets/wip/muktupavels/help-about] mini-commander: use gp_applet_show_help

[Alberts Muktupāvels <muktupavels src gnome org>]

commit fd82fd3536eaf3f592235ea8440e1e52298c2a3a
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Apr 3 16:10:51 2020 +0300

    mini-commander: use gp_applet_show_help

 gnome-applets/ga-module.c                          |  1 +
 gnome-applets/mini-commander/Makefile.am           |  2 -
 gnome-applets/mini-commander/help.c                | 41 --------------------
 gnome-applets/mini-commander/help.h                | 24 ------------
 .../mini-commander/mini-commander-applet.c         |  9 ++++-
 gnome-applets/mini-commander/preferences.c         | 45 +---------------------
 po/POTFILES.in                                     |  1 -
 7 files changed, 11 insertions(+), 112 deletions(-)
---
diff --git a/gnome-applets/ga-module.c b/gnome-applets/ga-module.c
index 439ebb126..d0959a742 100644
--- a/gnome-applets/ga-module.c
+++ b/gnome-applets/ga-module.c
@@ -167,6 +167,7 @@ ga_get_applet_info (const char *id)
       icon_name = "gnome-mini-commander";
 
       about_func = mini_commander_applet_setup_about;
+      help_uri = "help:command-line";
     }
   else if (g_strcmp0 (id, "multiload") == 0)
     {
diff --git a/gnome-applets/mini-commander/Makefile.am b/gnome-applets/mini-commander/Makefile.am
index e9775b005..e0e99e689 100644
--- a/gnome-applets/mini-commander/Makefile.am
+++ b/gnome-applets/mini-commander/Makefile.am
@@ -23,8 +23,6 @@ libmini_commander_applet_la_SOURCES = \
        mini-commander-applet-private.h \
        mini-commander-applet.c \
        mini-commander-applet.h \
-       help.c \
-       help.h \
        history.c \
        history.h \
        macro.c \
diff --git a/gnome-applets/mini-commander/mini-commander-applet.c 
b/gnome-applets/mini-commander/mini-commander-applet.c
index 571b78f06..87df0a855 100644
--- a/gnome-applets/mini-commander/mini-commander-applet.c
+++ b/gnome-applets/mini-commander/mini-commander-applet.c
@@ -32,7 +32,6 @@
 #include "mini-commander-applet-private.h"
 #include "preferences.h"
 #include "command-line.h"
-#include "help.h"
 #include "gsettings.h"
 
 #include "browser-mini.xpm"
@@ -48,6 +47,14 @@ G_DEFINE_TYPE (MiniCommanderApplet, mini_commander_applet, GP_TYPE_APPLET)
 static gboolean icons_initialized = FALSE;
 static GtkIconSize button_icon_size = 0;
 
+static void
+show_help (GSimpleAction *action,
+           GVariant      *parameter,
+           gpointer       user_data)
+{
+  gp_applet_show_help (GP_APPLET (user_data), NULL);
+}
+
 static void
 about_box (GSimpleAction *action,
            GVariant      *parameter,
diff --git a/gnome-applets/mini-commander/preferences.c b/gnome-applets/mini-commander/preferences.c
index 0df6f54da..a825659c9 100644
--- a/gnome-applets/mini-commander/preferences.c
+++ b/gnome-applets/mini-commander/preferences.c
@@ -226,47 +226,6 @@ duplicate_pattern (MCData     *mc,
     return FALSE;
 }
 
-static void
-show_help_section (GtkWindow *dialog, gchar *section)
-{
-       GError *error = NULL;
-       char *uri;
-
-       if (section)
-               uri = g_strdup_printf ("ghelp:command-line?%s", section);
-       else
-               uri = g_strdup ("ghelp:command-line");
-
-       gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)),
-                       uri,
-                       gtk_get_current_event_time (),
-                       &error);
-
-       g_free (uri);
-
-       if (error) {
-               GtkWidget *error_dialog;
-
-               error_dialog = gtk_message_dialog_new (
-                               NULL,
-                               GTK_DIALOG_DESTROY_WITH_PARENT,
-                               GTK_MESSAGE_ERROR,
-                               GTK_BUTTONS_OK,
-                               _("There was an error displaying help: %s"),
-                               error->message);
-
-               g_signal_connect (error_dialog, "response",
-                                 G_CALLBACK (gtk_widget_destroy),
-                                 NULL);
-
-               gtk_window_set_resizable (GTK_WINDOW (error_dialog), FALSE);
-               gtk_window_set_screen (GTK_WINDOW (error_dialog),
-                                      gtk_widget_get_screen (GTK_WIDGET (dialog)));
-               gtk_widget_show (error_dialog);
-               g_error_free (error);
-       }
-}
-
 static void
 add_response (GtkWidget *window,
              int        id,
@@ -330,7 +289,7 @@ add_response (GtkWidget *window,
     }
        break;
     case GTK_RESPONSE_HELP:
-       show_help_section (GTK_WINDOW (window), "command-line-prefs-2");
+        gp_applet_show_help (GP_APPLET (mc), "command-line-prefs-2");
        break;
     case GTK_RESPONSE_CLOSE:
     default:
@@ -526,7 +485,7 @@ preferences_response (MCPrefsDialog *dialog,
 {
     switch (id) {
     case GTK_RESPONSE_HELP:
-       show_help_section (GTK_WINDOW (dialog), "command-line-prefs-0");
+        gp_applet_show_help (GP_APPLET (mc), "command-line-apperance");
        break;
     case GTK_RESPONSE_CLOSE:
     default: {
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ebe5af098..d4aed2da5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -47,7 +47,6 @@ gnome-applets/gweather/gweather-pref.c
 gnome-applets/inhibit/inhibit-applet-menu.ui
 gnome-applets/inhibit/inhibit-applet.c
 gnome-applets/mini-commander/command-line.c
-gnome-applets/mini-commander/help.c
 gnome-applets/mini-commander/mini-commander-applet.c
 gnome-applets/mini-commander/mini-commander-applet-menu.ui
 gnome-applets/mini-commander/mini-commander.ui