From d1020226236576464be4ab47ec0098a588bef486 Mon Sep 17 00:00:00 2001 From: monsta Date: Fri, 2 Feb 2018 16:25:31 +0300 Subject: require GTK+ 3.22 and GLib 2.50 --- stickynotes/stickynotes.c | 7 ------- stickynotes/stickynotes_applet_callbacks.c | 16 ++-------------- 2 files changed, 2 insertions(+), 21 deletions(-) (limited to 'stickynotes') diff --git a/stickynotes/stickynotes.c b/stickynotes/stickynotes.c index 6b07b9fe..50d0f83a 100644 --- a/stickynotes/stickynotes.c +++ b/stickynotes/stickynotes.c @@ -378,17 +378,10 @@ static void response_cb (GtkWidget *dialog, gint id, gpointer data) { if (id == GTK_RESPONSE_HELP) -#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (dialog), "help:mate-stickynotes-applet/stickynotes-settings-individual", gtk_get_current_event_time (), NULL); -#else - gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)), - "help:mate-stickynotes-applet/stickynotes-settings-individual", - gtk_get_current_event_time (), - NULL); -#endif else if (id == GTK_RESPONSE_CLOSE) gtk_widget_hide (dialog); } diff --git a/stickynotes/stickynotes_applet_callbacks.c b/stickynotes/stickynotes_applet_callbacks.c index 81938256..a5e1281f 100644 --- a/stickynotes/stickynotes_applet_callbacks.c +++ b/stickynotes/stickynotes_applet_callbacks.c @@ -335,17 +335,11 @@ void menu_preferences_cb(GtkAction *action, StickyNotesApplet *applet) void menu_help_cb(GtkAction *action, StickyNotesApplet *applet) { GError *error = NULL; -#if GTK_CHECK_VERSION (3, 22, 0) + gtk_show_uri_on_window (NULL, "help:mate-stickynotes-applet", gtk_get_current_event_time (), &error); -#else - gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet->w_applet)), - "help:mate-stickynotes-applet", - gtk_get_current_event_time (), - &error); -#endif 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); @@ -531,17 +525,11 @@ void preferences_response_cb(GtkWidget *dialog, gint response, gpointer data) { if (response == GTK_RESPONSE_HELP) { GError *error = NULL; -#if GTK_CHECK_VERSION (3, 22, 0) + gtk_show_uri_on_window (GTK_WINDOW (dialog), "help:mate-stickynotes-applet/stickynotes-advanced-settings", gtk_get_current_event_time (), &error); -#else - gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)), - "help:mate-stickynotes-applet/stickynotes-advanced-settings", - gtk_get_current_event_time (), - &error); -#endif if (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); -- cgit v1.2.1