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

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

commit e9e0ac5ddb344b3cab7b0974ae7c93dab13c6518
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Apr 3 04:49:10 2020 +0300

    cpufreq: use gp_applet_show_help

 gnome-applets/cpufreq/cpufreq-applet.c | 15 ++-------------
 gnome-applets/cpufreq/cpufreq-prefs.c  | 17 ++++++-----------
 gnome-applets/cpufreq/cpufreq-prefs.h  |  3 ++-
 gnome-applets/cpufreq/cpufreq-utils.c  | 26 --------------------------
 gnome-applets/cpufreq/cpufreq-utils.h  |  2 --
 gnome-applets/ga-module.c              |  1 +
 6 files changed, 11 insertions(+), 53 deletions(-)
---
diff --git a/gnome-applets/cpufreq/cpufreq-applet.c b/gnome-applets/cpufreq/cpufreq-applet.c
index becfc21db..0cd450a31 100644
--- a/gnome-applets/cpufreq/cpufreq-applet.c
+++ b/gnome-applets/cpufreq/cpufreq-applet.c
@@ -596,18 +596,7 @@ cpufreq_applet_help_cb (GSimpleAction *action,
                         GVariant      *parameter,
                         gpointer       user_data)
 {
-        GError *error = NULL;
-           
-       gtk_show_uri_on_window (NULL,
-                               "help:cpufreq-applet",
-                               gtk_get_current_event_time (),
-                               &error);
-
-        if (error) {
-                cpufreq_utils_display_error (_("Could not open help document"),
-                                             error->message);
-                g_error_free (error);
-        }
+  gp_applet_show_help (GP_APPLET (user_data), NULL);
 }
 
 static void
@@ -932,7 +921,7 @@ cpufreq_applet_setup (CPUFreqApplet *applet)
        GSettings *settings;
 
         settings = gp_applet_settings_new (GP_APPLET (applet), "org.gnome.gnome-applets.cpufreq");
-        applet->prefs = cpufreq_prefs_new (settings);
+        applet->prefs = cpufreq_prefs_new (applet, settings);
 
        g_signal_connect (G_OBJECT (applet->prefs),
                          "notify::cpu",
diff --git a/gnome-applets/cpufreq/cpufreq-prefs.c b/gnome-applets/cpufreq/cpufreq-prefs.c
index 07a1a8965..c51e75bcc 100644
--- a/gnome-applets/cpufreq/cpufreq-prefs.c
+++ b/gnome-applets/cpufreq/cpufreq-prefs.c
@@ -38,6 +38,7 @@ struct _CPUFreqPrefsPrivate {
        CPUFreqShowMode     show_mode;
        CPUFreqShowTextMode show_text_mode;
 
+       CPUFreqApplet *applet;
        GSettings *settings;
 
        /* Preferences dialog */
@@ -221,13 +222,15 @@ cpufreq_prefs_setup (CPUFreqPrefs *prefs)
 }
 
 CPUFreqPrefs *
-cpufreq_prefs_new (GSettings *settings)
+cpufreq_prefs_new (CPUFreqApplet *applet,
+                   GSettings     *settings)
 {
        CPUFreqPrefs *prefs;
 
        g_return_val_if_fail (settings != NULL, NULL);
 
        prefs = CPUFREQ_PREFS (g_object_new (CPUFREQ_TYPE_PREFS, NULL));
+       prefs->priv->applet = applet;
        prefs->priv->settings = g_object_ref (settings);
 
        cpufreq_prefs_setup (prefs);
@@ -347,16 +350,8 @@ cpufreq_prefs_dialog_response_cb (CPUFreqPrefs *prefs,
         GError *error = NULL;
 
         if (response == GTK_RESPONSE_HELP) {
-               gtk_show_uri_on_window (GTK_WINDOW (prefs->priv->dialog),
-                                       "help:cpufreq-applet/cpufreq-applet-prefs",
-                                       gtk_get_current_event_time (),
-                                       &error);
-
-                if (error) {
-                        cpufreq_utils_display_error (_("Could not open help document"),
-                                                    error->message);
-                        g_error_free (error);
-               }
+                gp_applet_show_help (GP_APPLET (prefs->priv->applet),
+                                     "cpufreq-applet-prefs");
         } else {
                 gtk_widget_destroy (prefs->priv->dialog);
                 prefs->priv->dialog = NULL;
diff --git a/gnome-applets/cpufreq/cpufreq-prefs.h b/gnome-applets/cpufreq/cpufreq-prefs.h
index 1ef0b4411..878a2328d 100644
--- a/gnome-applets/cpufreq/cpufreq-prefs.h
+++ b/gnome-applets/cpufreq/cpufreq-prefs.h
@@ -50,7 +50,8 @@ struct _CPUFreqPrefsClass {
 
 GType               cpufreq_prefs_get_type           (void) G_GNUC_CONST;
 
-CPUFreqPrefs       *cpufreq_prefs_new                (GSettings *settings);
+CPUFreqPrefs       *cpufreq_prefs_new                (CPUFreqApplet *applet,
+                                                      GSettings     *settings);
 
 guint               cpufreq_prefs_get_cpu            (CPUFreqPrefs *prefs);
 CPUFreqShowMode     cpufreq_prefs_get_show_mode      (CPUFreqPrefs *prefs);
diff --git a/gnome-applets/cpufreq/cpufreq-utils.c b/gnome-applets/cpufreq/cpufreq-utils.c
index 16c5abb15..54ff6de3b 100644
--- a/gnome-applets/cpufreq/cpufreq-utils.c
+++ b/gnome-applets/cpufreq/cpufreq-utils.c
@@ -59,32 +59,6 @@ cpufreq_utils_get_n_cpus (void)
        return 1;
 }
 
-void
-cpufreq_utils_display_error (const gchar *message,
-                            const gchar *secondary)
-{
-       GtkWidget *dialog;
-
-       g_return_if_fail (message != NULL);
-
-       dialog = gtk_message_dialog_new (NULL,
-                                        GTK_DIALOG_DESTROY_WITH_PARENT,
-                                        GTK_MESSAGE_ERROR,
-                                        GTK_BUTTONS_OK,
-                                        "%s", message);
-       if (secondary) {
-               gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                         "%s", secondary);
-       }
-       
-       gtk_window_set_title (GTK_WINDOW (dialog), ""); /* as per HIG */
-       gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), TRUE);
-       g_signal_connect (G_OBJECT (dialog),
-                         "response",
-                         G_CALLBACK (gtk_widget_destroy), NULL);
-       gtk_widget_show (dialog);
-}
-
 #define CACHE_VALIDITY_SEC 2
 
 static gboolean
diff --git a/gnome-applets/cpufreq/cpufreq-utils.h b/gnome-applets/cpufreq/cpufreq-utils.h
index a1f2cee1b..0be549a21 100644
--- a/gnome-applets/cpufreq/cpufreq-utils.h
+++ b/gnome-applets/cpufreq/cpufreq-utils.h
@@ -27,8 +27,6 @@ G_BEGIN_DECLS
 
 /* Useful global methods */
 guint    cpufreq_utils_get_n_cpus            (void);
-void     cpufreq_utils_display_error         (const gchar *message,
-                                             const gchar *secondary);
 gboolean cpufreq_utils_selector_is_available (void);
 gchar   *cpufreq_utils_get_frequency_label   (guint        freq);
 gchar   *cpufreq_utils_get_frequency_unit    (guint        freq);
diff --git a/gnome-applets/ga-module.c b/gnome-applets/ga-module.c
index 52ef30cd5..3e9f3e5e1 100644
--- a/gnome-applets/ga-module.c
+++ b/gnome-applets/ga-module.c
@@ -117,6 +117,7 @@ ga_get_applet_info (const char *id)
       icon_name = "gnome-cpu-frequency-applet";
 
       about_func = cpufreq_applet_setup_about;
+      help_uri = "help:cpufreq-applet";
     }
 #endif
   else if (g_strcmp0 (id, "drivemount") == 0)