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

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

commit 7df07eec88a346b21cf5b0c88650656aff6ab64f
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Apr 3 16:30:29 2020 +0300

    netspeed: use gp_applet_show_help

 gnome-applets/ga-module.c                |  1 +
 gnome-applets/netspeed/netspeed-applet.c | 47 ++------------------------------
 gnome-applets/netspeed/netspeed-applet.h |  3 --
 gnome-applets/netspeed/preferences.c     |  3 +-
 4 files changed, 5 insertions(+), 49 deletions(-)
---
diff --git a/gnome-applets/ga-module.c b/gnome-applets/ga-module.c
index 2b8fceabe..1c69e6996 100644
--- a/gnome-applets/ga-module.c
+++ b/gnome-applets/ga-module.c
@@ -187,6 +187,7 @@ ga_get_applet_info (const char *id)
       icon_name = "netspeed-applet";
 
       about_func = netspeed_applet_setup_about;
+      help_uri = "help:netspeed_applet";
     }
   else if (g_strcmp0 (id, "sticky-notes") == 0)
     {
diff --git a/gnome-applets/netspeed/netspeed-applet.c b/gnome-applets/netspeed/netspeed-applet.c
index 5311354f1..54a70972a 100644
--- a/gnome-applets/netspeed/netspeed-applet.c
+++ b/gnome-applets/netspeed/netspeed-applet.c
@@ -584,18 +584,12 @@ timeout_function(NetspeedApplet *applet)
        return TRUE;
 }
 
-/* Opens gnome help application
- */
 static void
 help_cb (GSimpleAction *action,
          GVariant      *parameter,
          gpointer       user_data)
 {
-       NetspeedApplet *netspeed;
-
-       netspeed = NETSPEED_APPLET (user_data);
-
-       netspeed_applet_display_help (netspeed, NULL);
+  gp_applet_show_help (GP_APPLET (user_data), NULL);
 }
 
 static void
@@ -795,7 +789,7 @@ static void
 info_response_cb (GtkDialog *dialog, gint id, NetspeedApplet *applet)
 {
        if (id == GTK_RESPONSE_HELP) {
-               netspeed_applet_display_help (applet, "netspeed_applet-details");
+               gp_applet_show_help (GP_APPLET (applet), "netspeed_applet-details");
                return;
        }
 
@@ -1461,43 +1455,6 @@ netspeed_applet_setup (GpApplet *applet)
        setup_menu (applet);
 }
 
-void
-netspeed_applet_display_help (NetspeedApplet *netspeed,
-                              const gchar    *section)
-{
-       GError *error;
-       gboolean ret;
-       gchar *uri;
-
-       if (section)
-               uri = g_strdup_printf ("help:netspeed_applet/%s", section);
-       else
-               uri = g_strdup ("help:netspeed_applet");
-
-       error = NULL;
-       ret = gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (netspeed)),
-                           uri, GDK_CURRENT_TIME, &error);
-       g_free (uri);
-
-       if (ret == FALSE) {
-               GtkWidget *error_dialog;
-
-               error_dialog = gtk_message_dialog_new (NULL,
-                                                      GTK_DIALOG_MODAL,
-                                                      GTK_MESSAGE_ERROR,
-                                                      GTK_BUTTONS_OK,
-                                                      _("There was an error displaying help:\n%s"),
-                                                      error->message);
-               g_error_free (error);
-
-               g_signal_connect (error_dialog, "response",
-                                 G_CALLBACK (gtk_widget_destroy), NULL);
-
-               gtk_window_set_resizable (GTK_WINDOW (error_dialog), FALSE);
-               gtk_widget_show (error_dialog);
-       }
-}
-
 GSettings *
 netspeed_applet_get_settings (NetspeedApplet *netspeed)
 {
diff --git a/gnome-applets/netspeed/netspeed-applet.h b/gnome-applets/netspeed/netspeed-applet.h
index 949dcbaa5..c3d630eec 100644
--- a/gnome-applets/netspeed/netspeed-applet.h
+++ b/gnome-applets/netspeed/netspeed-applet.h
@@ -28,9 +28,6 @@ G_DECLARE_FINAL_TYPE (NetspeedApplet, netspeed_applet,
                       NETSPEED, APPLET,
                       GpApplet)
 
-void         netspeed_applet_display_help            (NetspeedApplet *netspeed,
-                                                      const gchar    *section);
-
 GSettings   *netspeed_applet_get_settings            (NetspeedApplet *netspeed);
 
 const gchar *netspeed_applet_get_current_device_name (NetspeedApplet *netspeed);
diff --git a/gnome-applets/netspeed/preferences.c b/gnome-applets/netspeed/preferences.c
index a95f55d9a..605356d7b 100644
--- a/gnome-applets/netspeed/preferences.c
+++ b/gnome-applets/netspeed/preferences.c
@@ -277,7 +277,8 @@ netspeed_preferences_response (GtkDialog *dialog,
 
   switch (response_id) {
     case GTK_RESPONSE_HELP:
-      netspeed_applet_display_help (preferences->netspeed, "netspeed_applet-settings");
+      gp_applet_show_help (GP_APPLET (preferences->netspeed),
+                           "netspeed_applet-settings");
       break;
     default:
       gtk_widget_destroy (GTK_WIDGET (preferences));