[balsa/popover] HTML: Simplify popup code

[Peter Bloomfield <peterb src gnome org>]

commit 7a42943c7d840909c3e321fc9c974a04ca5ef0b9
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu May 14 13:13:01 2020 -0400

    HTML: Simplify popup code

 libbalsa/html.c              |  9 +--------
 libbalsa/html.h              |  1 -
 src/balsa-mime-widget-text.c | 32 ++++++--------------------------
 3 files changed, 7 insertions(+), 35 deletions(-)
---
diff --git a/libbalsa/html.c b/libbalsa/html.c
index 675f9d6b8..2fd395395 100644
--- a/libbalsa/html.c
+++ b/libbalsa/html.c
@@ -1070,15 +1070,8 @@ libbalsa_html_get_selection_bounds(GtkWidget    * widget,
 }
 
 /*
- * Get the WebKitWebView widget from the container; we need to connect
- * to its "populate-popup" signal.
+ * Get the view widget
  */
-GtkWidget *
-libbalsa_html_popup_menu_widget(GtkWidget * widget)
-{
-    return NULL;
-}
-
 GtkWidget *
 libbalsa_html_get_view_widget(GtkWidget * widget)
 {
diff --git a/libbalsa/html.h b/libbalsa/html.h
index bd8cc4df3..e895ecbc2 100644
--- a/libbalsa/html.h
+++ b/libbalsa/html.h
@@ -67,7 +67,6 @@ gboolean libbalsa_html_get_selection_bounds(GtkWidget * widget,
                                             selection_bounds);
 
 #define LIBBALSA_HTML_POPUP_EVENT "libbalsa-html-popup-event"
-GtkWidget *libbalsa_html_popup_menu_widget(GtkWidget * widget);
 GtkWidget *libbalsa_html_get_view_widget(GtkWidget * widget);
 
 gboolean libbalsa_html_can_print(GtkWidget * widget);
diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c
index be62eeddd..3688075ef 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -1198,22 +1198,9 @@ balsa_gtk_html_popup(GtkWidget * html, BalsaMessage * bm)
 static gboolean
 balsa_gtk_html_button_press_cb(GtkWidget * html, GdkEventButton * event,
                                BalsaMessage * bm)
- {
-    return(gdk_event_triggers_context_menu((GdkEvent *) event)
-            ? balsa_gtk_html_popup(html, bm) : GDK_EVENT_PROPAGATE);
- }
-
-static void
-bmwt_populate_popup_cb(GtkWidget * widget, GtkMenu * menu, gpointer data)
 {
-    BalsaMessage *bm =
-        g_object_get_data(G_OBJECT(widget), "balsa-message");
-    GtkWidget *html = data;
-
-    /* Remove WebKitWebView's items--they're irrelevant and confusing */
-    gtk_container_foreach(GTK_CONTAINER(menu),
-                         (GtkCallback) gtk_widget_destroy, NULL);
-    bmwt_populate_popup_menu(bm, html, menu);
+    return(gdk_event_triggers_context_menu((GdkEvent *) event)
+           ? balsa_gtk_html_popup(html, bm) : GDK_EVENT_PROPAGATE);
 }
 
 static BalsaMimeWidget *
@@ -1221,7 +1208,6 @@ bm_widget_new_html(BalsaMessage * bm, LibBalsaMessageBody * mime_body)
 {
     BalsaMimeWidget *mw = g_object_new(BALSA_TYPE_MIME_WIDGET, NULL);
     GtkWidget *widget;
-    GtkWidget *popup_menu;
 
     widget =
         libbalsa_html_new(mime_body,
@@ -1235,16 +1221,10 @@ bm_widget_new_html(BalsaMessage * bm, LibBalsaMessageBody * mime_body)
                      "key_press_event",
                      G_CALLBACK(balsa_mime_widget_key_press_event), bm);
 
-    if ((popup_menu = libbalsa_html_popup_menu_widget(widget)) != NULL) {
-        g_object_set_data(G_OBJECT(popup_menu), "balsa-message", bm);
-        g_signal_connect(popup_menu, "populate-popup",
-                         G_CALLBACK(bmwt_populate_popup_cb), widget);
-    } else {
-        g_signal_connect(widget, "button-press-event",
-                         G_CALLBACK(balsa_gtk_html_button_press_cb), bm);
-        g_signal_connect(widget, "popup-menu",
-                         G_CALLBACK(balsa_gtk_html_popup), bm);
-    }
+    g_signal_connect(widget, "button-press-event",
+                     G_CALLBACK(balsa_gtk_html_button_press_cb), bm);
+    g_signal_connect(widget, "popup-menu",
+                     G_CALLBACK(balsa_gtk_html_popup), bm);
 
     return mw;
 }