[gnome-applets/wip/muktupavels/help-about] sticky-notes: 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] sticky-notes: use gp_applet_show_help
- Date: Fri, 3 Apr 2020 14:25:01 +0000 (UTC)
commit 1bcfca0ba9634f9fe6600b796326d9ae829846bf
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Fri Apr 3 16:43:16 2020 +0300
sticky-notes: use gp_applet_show_help
gnome-applets/ga-module.c | 1 +
.../sticky-notes/sticky-notes-applet-callbacks.c | 20 --------------------
.../sticky-notes/sticky-notes-applet-callbacks.h | 1 -
gnome-applets/sticky-notes/sticky-notes-applet.c | 8 ++++++++
4 files changed, 9 insertions(+), 21 deletions(-)
---
diff --git a/gnome-applets/ga-module.c b/gnome-applets/ga-module.c
index 53c91dd74..7e13f9bb5 100644
--- a/gnome-applets/ga-module.c
+++ b/gnome-applets/ga-module.c
@@ -197,6 +197,7 @@ ga_get_applet_info (const char *id)
icon_name = "gnome-sticky-notes-applet";
about_func = stickynotes_applet_setup_about;
+ help_uri = "help:stickynotes_applet";
}
else if (g_strcmp0 (id, "timer") == 0)
{
diff --git a/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c
b/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c
index 64ba6286d..8920fff2f 100644
--- a/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c
+++ b/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c
@@ -350,26 +350,6 @@ void menu_preferences_cb(GSimpleAction *action, GVariant *parameter, gpointer us
gtk_window_present(GTK_WINDOW(stickynotes->w_prefs));
}
-/* Menu Callback : Show help */
-void menu_help_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data)
-{
- StickyNotesApplet *applet = (StickyNotesApplet *) user_data;
- GError *error = NULL;
- gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)),
- "help:stickynotes_applet",
- 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 (applet)));
- gtk_widget_show(dialog);
- g_error_free(error);
- }
-}
-
/* Preferences Callback : Save. */
void
preferences_save_cb (gpointer data)
diff --git a/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.h
b/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.h
index 2ce3d0a90..46ffc4b53 100644
--- a/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.h
+++ b/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.h
@@ -37,7 +37,6 @@ void menu_destroy_all_cb(GSimpleAction *action, GVariant *parameter, gpointer us
void menu_toggle_lock_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data);
void menu_toggle_lock_state(GSimpleAction *action, GVariant *value, gpointer user_data);
void menu_preferences_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data);
-void menu_help_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data);
/* Callbacks for sticky notes preferences dialog */
void preferences_save_cb(gpointer data);
diff --git a/gnome-applets/sticky-notes/sticky-notes-applet.c
b/gnome-applets/sticky-notes/sticky-notes-applet.c
index 7d9fac773..df97593fd 100644
--- a/gnome-applets/sticky-notes/sticky-notes-applet.c
+++ b/gnome-applets/sticky-notes/sticky-notes-applet.c
@@ -36,6 +36,14 @@ static void sticky_notes_init_prefs (void);
static void sticky_notes_applet_new (StickyNotesApplet *self);
+static void
+menu_help_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
+{
+ gp_applet_show_help (GP_APPLET (user_data), NULL);
+}
+
static void
menu_about_cb (GSimpleAction *action,
GVariant *parameter,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]