[gnome-applets/wip/muktupavels/help-about] multiload: use gp_applet_show_help
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets/wip/muktupavels/help-about] multiload: use gp_applet_show_help
- Date: Fri, 3 Apr 2020 14:24:41 +0000 (UTC)
commit afe7438078513c6c41d3188d8557bea3cb33b427
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Fri Apr 3 16:22:53 2020 +0300
multiload: use gp_applet_show_help
gnome-applets/ga-module.c | 1 +
gnome-applets/multiload/multiload-applet.c | 14 +-------------
gnome-applets/multiload/properties.c | 12 +-----------
3 files changed, 3 insertions(+), 24 deletions(-)
---
diff --git a/gnome-applets/ga-module.c b/gnome-applets/ga-module.c
index 7dad79a92..115e38d1d 100644
--- a/gnome-applets/ga-module.c
+++ b/gnome-applets/ga-module.c
@@ -177,6 +177,7 @@ ga_get_applet_info (const char *id)
icon_name = "utilities-system-monitor";
about_func = multiload_applet_setup_about;
+ help_uri = "help:multiload";
}
else if (g_strcmp0 (id, "netspeed") == 0)
{
diff --git a/gnome-applets/multiload/multiload-applet.c b/gnome-applets/multiload/multiload-applet.c
index fe75ab714..5e688f518 100644
--- a/gnome-applets/multiload/multiload-applet.c
+++ b/gnome-applets/multiload/multiload-applet.c
@@ -43,19 +43,7 @@ help_cb (GSimpleAction *action,
GVariant *parameter,
gpointer user_data)
{
- MultiloadApplet *ma = (MultiloadApplet *) user_data;
- GError *error = NULL;
-
- gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (ma)),
- "help:multiload",
- gtk_get_current_event_time (),
- &error);
-
- if (error) { /* FIXME: the user needs to see this */
- g_warning ("help error: %s\n", error->message);
- g_error_free (error);
- error = NULL;
- }
+ gp_applet_show_help (GP_APPLET (user_data), NULL);
}
/* run the full-scale system process monitor */
diff --git a/gnome-applets/multiload/properties.c b/gnome-applets/multiload/properties.c
index 3a4696c3b..2eea55a30 100644
--- a/gnome-applets/multiload/properties.c
+++ b/gnome-applets/multiload/properties.c
@@ -75,17 +75,7 @@ properties_close_cb (GtkWidget *widget, gint arg, MultiloadApplet *ma)
switch (arg)
{
case GTK_RESPONSE_HELP:
-
- gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (ma)),
- "help:multiload/multiload-prefs",
- gtk_get_current_event_time (),
- &error);
-
- if (error) { /* FIXME: the user needs to see this */
- g_warning ("help error: %s\n", error->message);
- g_error_free (error);
- error = NULL;
- }
+ gp_applet_show_help (GP_APPLET (ma), "multiload-prefs");
break;
case GTK_RESPONSE_CLOSE:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]