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



commit 5dd51690b84b4cc8c7ef81d55c4acfa070146802
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Apr 3 15:40:46 2020 +0300

    geyes: use gp_applet_show_help

 gnome-applets/ga-module.c          |  1 +
 gnome-applets/geyes/geyes-applet.c | 19 +------------------
 gnome-applets/geyes/themes.c       | 25 +------------------------
 3 files changed, 3 insertions(+), 42 deletions(-)
---
diff --git a/gnome-applets/ga-module.c b/gnome-applets/ga-module.c
index b40cf94d8..70892e3cf 100644
--- a/gnome-applets/ga-module.c
+++ b/gnome-applets/ga-module.c
@@ -138,6 +138,7 @@ ga_get_applet_info (const char *id)
       icon_name = "gnome-eyes-applet";
 
       about_func = eyes_applet_setup_about;
+      help_uri = "help:geyes";
     }
   else if (g_strcmp0 (id, "gweather") == 0)
     {
diff --git a/gnome-applets/geyes/geyes-applet.c b/gnome-applets/geyes/geyes-applet.c
index 5fd1c838c..ff6b1e9b8 100644
--- a/gnome-applets/geyes/geyes-applet.c
+++ b/gnome-applets/geyes/geyes-applet.c
@@ -250,24 +250,7 @@ help_cb (GSimpleAction *action,
          GVariant      *parameter,
          gpointer       user_data)
 {
-       EyesApplet *eyes_applet = (EyesApplet *) user_data;
-       GError *error = NULL;
-
-       gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (eyes_applet)),
-               "help:geyes",
-               gtk_get_current_event_time (),
-               &error);
-
-       if (error) {
-               GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, 
GTK_BUTTONS_CLOSE, 
-                                                           _("There was an error displaying help: %s"), 
error->message);
-               g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), NULL);
-               gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-               gtk_window_set_screen (GTK_WINDOW (dialog), gtk_widget_get_screen (GTK_WIDGET (eyes_applet)));
-               gtk_widget_show (dialog);
-               g_error_free (error);
-               error = NULL;
-       }
+  gp_applet_show_help (GP_APPLET (user_data), NULL);
 }
 
 static const GActionEntry geyes_applet_menu_actions [] = {
diff --git a/gnome-applets/geyes/themes.c b/gnome-applets/geyes/themes.c
index 798f891cf..46cde7c9e 100644
--- a/gnome-applets/geyes/themes.c
+++ b/gnome-applets/geyes/themes.c
@@ -220,38 +220,15 @@ theme_selected_cb (GtkTreeSelection *selection, gpointer data)
        g_free (theme);
 }
 
-static void
-phelp_cb (GtkDialog *dialog)
-{
-       GError *error = NULL;
-
-       gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)),
-               "help:geyes/geyes-settings",
-               gtk_get_current_event_time (),
-               &error);
-
-       if (error) {
-               GtkWidget *error_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, 
GTK_BUTTONS_CLOSE,
-                                                                 _("There was an error displaying help: 
%s"), error->message);
-               g_signal_connect (G_OBJECT (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);
-               error = NULL;
-       }
-}
-
 static void
 presponse_cb (GtkDialog *dialog, gint id, gpointer data)
 {
        EyesApplet *eyes_applet = data;
        if(id == GTK_RESPONSE_HELP){
-               phelp_cb (dialog);
+               gp_applet_show_help (GP_APPLET (eyes_applet), "geyes-settings");
                return;
        }
 
-
        gtk_widget_destroy (GTK_WIDGET (dialog));
 
        eyes_applet->prop_box.pbox = NULL;


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