[balsa/gtk4: 251/314] filter-run-callbacks: Build with gtk4




commit ac28ada12a43d386b6a353bccf15f8317251fd43
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Oct 24 18:26:17 2020 -0400

    filter-run-callbacks: Build with gtk4

 src/filter-run-callbacks.c | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/src/filter-run-callbacks.c b/src/filter-run-callbacks.c
index 31f31d6fd..8149b4815 100644
--- a/src/filter-run-callbacks.c
+++ b/src/filter-run-callbacks.c
@@ -158,11 +158,26 @@ void save_filters(BalsaFilterRunDialog * p)
 }
 
 /* Dialog box button callbacks */
+static void
+help_button_finish(GObject      *source_object,
+                   GAsyncResult *result,
+                   gpointer      user_data)
+{
+    GtkWindow *parent = user_data;
+    GError *error = NULL;
+
+    if (!gtk_show_uri_full_finish(parent, result, &error)) {
+       libbalsa_information(LIBBALSA_INFORMATION_WARNING,
+                            _("Error displaying run filters help: %s\n"),
+                             error->message);
+        g_error_free(error);
+    }
+}
+
 void fr_dialog_response(GtkWidget * widget, gint response,
                        gpointer throwaway)
 {
     BalsaFilterRunDialog * p;
-    GError *err = NULL;
 
     p=BALSA_FILTER_RUN_DIALOG(widget);
     switch (response) {
@@ -177,23 +192,16 @@ void fr_dialog_response(GtkWidget * widget, gint response,
 
        break;
     case GTK_RESPONSE_HELP:     /* Help button */
-        gtk_show_uri_on_window(GTK_WINDOW(widget),
-                               "help:balsa/win-run-filters",
-                               gtk_get_current_event_time(), &err);
-       if (err) {
-           balsa_information_parented(GTK_WINDOW(widget),
-                   LIBBALSA_INFORMATION_WARNING,
-                   _("Error displaying run filters help: %s\n"),
-                   err->message);
-           g_error_free(err);
-       }
+        gtk_show_uri_full(GTK_WINDOW(widget),
+                          "help:balsa/win-run-filters",
+                          GDK_CURRENT_TIME, NULL, help_button_finish, widget);
        return;
 
     default:
        /* we should NEVER get here */
        break;
     }
-    gtk_widget_destroy(GTK_WIDGET(p));
+    gtk_window_destroy(GTK_WINDOW(p));
 }
 
 


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