[gnome-applets/wip/muktupavels/help-about] multiload: use gp_applet_show_about



commit 5054ee6609e9fc08f85d2b6fdeb6082963373ac0
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Apr 3 16:20:58 2020 +0300

    multiload: use gp_applet_show_about

 gnome-applets/ga-module.c                  |  2 +
 gnome-applets/multiload/global.h           |  3 +-
 gnome-applets/multiload/multiload-applet.c | 69 +++++++++++++++++-------------
 gnome-applets/multiload/multiload-applet.h |  2 +
 4 files changed, 44 insertions(+), 32 deletions(-)
---
diff --git a/gnome-applets/ga-module.c b/gnome-applets/ga-module.c
index d0959a742..7dad79a92 100644
--- a/gnome-applets/ga-module.c
+++ b/gnome-applets/ga-module.c
@@ -175,6 +175,8 @@ ga_get_applet_info (const char *id)
       name = _("System Monitor");
       description = _("A system load indicator");
       icon_name = "utilities-system-monitor";
+
+      about_func = multiload_applet_setup_about;
     }
   else if (g_strcmp0 (id, "netspeed") == 0)
     {
diff --git a/gnome-applets/multiload/global.h b/gnome-applets/multiload/global.h
index c399a1ce6..91b7f592a 100644
--- a/gnome-applets/multiload/global.h
+++ b/gnome-applets/multiload/global.h
@@ -114,8 +114,7 @@ struct _MultiloadApplet
        gboolean view_swapload;
        gboolean view_loadavg;
        gboolean view_diskload;
-       
-       GtkWidget *about_dialog;
+
        GtkWidget *check_boxes[NGRAPHS];
        GtkWidget *prop_dialog;
        GtkWidget *notebook;
diff --git a/gnome-applets/multiload/multiload-applet.c b/gnome-applets/multiload/multiload-applet.c
index 976b53814..fe75ab714 100644
--- a/gnome-applets/multiload/multiload-applet.c
+++ b/gnome-applets/multiload/multiload-applet.c
@@ -35,34 +35,7 @@ about_cb (GSimpleAction *action,
           GVariant      *parameter,
           gpointer       user_data)
 {
-    const gchar * const authors[] =
-    {
-               "Martin Baulig <martin home-of-linux org>",
-               "Todd Kulesza <fflewddur dropline net>",
-               "Benoît Dejean <TazForEver dlfp org>",
-               "Davyd Madeley <davyd madeley id au>",
-               NULL
-    };
-
-    const gchar * const documenters[] =
-    {
-               "Chee Bin HOH <cbhoh gnome org>",
-               "Sun GNOME Documentation Team <gdocteam sun com>",
-               NULL
-    };
-
-    gtk_show_about_dialog (NULL,
-       "version",      VERSION,
-       "copyright",    "\xC2\xA9 1999-2005 Free Software Foundation "
-                       "and others",
-       "comments",     _("A system load monitor capable of displaying graphs "
-                       "for CPU, ram, and swap space use, plus network "
-                       "traffic."),
-       "authors",      authors,
-       "documenters",  documenters,
-       "translator-credits",   _("translator-credits"),
-       "logo-icon-name",       "utilities-system-monitor",
-       NULL);
+  gp_applet_show_about (GP_APPLET (user_data));
 }
 
 static void
@@ -419,7 +392,6 @@ multiload_applet_setup (MultiloadApplet *ma)
        const char *menu_resource;
        GAction *action;
 
-       ma->about_dialog = NULL;
        ma->prop_dialog = NULL;
        ma->last_clicked = 0;
 
@@ -501,7 +473,6 @@ multiload_applet_dispose (GObject *object)
 
   g_clear_object (&self->settings);
 
-  g_clear_pointer (&self->about_dialog, gtk_widget_destroy);
   g_clear_pointer (&self->prop_dialog, gtk_widget_destroy);
 
   G_OBJECT_CLASS (multiload_applet_parent_class)->dispose (object);
@@ -522,3 +493,41 @@ static void
 multiload_applet_init (MultiloadApplet *self)
 {
 }
+
+void
+multiload_applet_setup_about (GtkAboutDialog *dialog)
+{
+  const char *comments;
+  const char **authors;
+  const char **documenters;
+  const char *copyright;
+
+  comments = _("A system load monitor capable of displaying graphs "
+               "for CPU, ram, and swap space use, plus network "
+               "traffic.");
+
+  authors = (const char *[])
+    {
+      "Martin Baulig <martin home-of-linux org>",
+      "Todd Kulesza <fflewddur dropline net>",
+      "Benoît Dejean <TazForEver dlfp org>",
+      "Davyd Madeley <davyd madeley id au>",
+      NULL
+    };
+
+  documenters = (const char *[])
+    {
+      "Chee Bin HOH <cbhoh gnome org>",
+      "Sun GNOME Documentation Team <gdocteam sun com>",
+      NULL
+    };
+
+  copyright = "\xC2\xA9 1999-2005 Free Software Foundation and others";
+
+  gtk_about_dialog_set_comments (dialog, comments);
+
+  gtk_about_dialog_set_authors (dialog, authors);
+  gtk_about_dialog_set_documenters (dialog, documenters);
+  gtk_about_dialog_set_translator_credits (dialog, _("translator-credits"));
+  gtk_about_dialog_set_copyright (dialog, copyright);
+}
diff --git a/gnome-applets/multiload/multiload-applet.h b/gnome-applets/multiload/multiload-applet.h
index 041c13b32..7d9180637 100644
--- a/gnome-applets/multiload/multiload-applet.h
+++ b/gnome-applets/multiload/multiload-applet.h
@@ -26,6 +26,8 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (MultiloadApplet, multiload_applet,
                       MULTILOAD, APPLET, GpApplet)
 
+void multiload_applet_setup_about (GtkAboutDialog *dialog);
+
 G_END_DECLS
 
 #endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]