[balsa] Use gdk_event_triggers_context_menu

[Peter Bloomfield <peterb src gnome org>]

commit 214347efd22771210b12c7121769808ec646a766
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Jun 15 21:59:58 2017 -0400

    Use gdk_event_triggers_context_menu
    
        Use gdk_event_triggers_context_menu instead of checking event
        type and button
    
        * src/balsa-index.c (bndx_button_event_press_cb):
        * src/balsa-mblist.c (bmbl_button_press_cb):
        * src/balsa-message.c (tree_button_press_cb):
        * src/balsa-mime-widget-image.c (balsa_image_button_press_cb):
        * src/balsa-mime-widget-text.c (balsa_gtk_html_button_press_cb):
        * src/sendmsg-window.c (attachment_button_press_cb):

 ChangeLog                     |   12 ++++++++++++
 src/balsa-index.c             |    2 +-
 src/balsa-mblist.c            |    2 +-
 src/balsa-message.c           |    2 +-
 src/balsa-mime-widget-image.c |    2 +-
 src/balsa-mime-widget-text.c  |    2 +-
 src/sendmsg-window.c          |    2 +-
 7 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b3cbedc..95669f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2017-06-15  Peter Bloomfield  <pbloomfield bellsouth net>
 
+       Use gdk_event_triggers_context_menu instead of checking event
+       type and button
+
+       * src/balsa-index.c (bndx_button_event_press_cb):
+       * src/balsa-mblist.c (bmbl_button_press_cb):
+       * src/balsa-message.c (tree_button_press_cb):
+       * src/balsa-mime-widget-image.c (balsa_image_button_press_cb):
+       * src/balsa-mime-widget-text.c (balsa_gtk_html_button_press_cb):
+       * src/sendmsg-window.c (attachment_button_press_cb):
+
+2017-06-15  Peter Bloomfield  <pbloomfield bellsouth net>
+
        Simplify popping up a toolbar's context menu, and make icons
        visible after changing style
 
diff --git a/src/balsa-index.c b/src/balsa-index.c
index ca1fad4..fd15180 100644
--- a/src/balsa-index.c
+++ b/src/balsa-index.c
@@ -616,7 +616,7 @@ bndx_button_event_press_cb(GtkWidget * widget, GdkEventButton * event,
     BalsaIndex *index = BALSA_INDEX(widget);
 
     g_return_val_if_fail(event, FALSE);
-    if (event->type != GDK_BUTTON_PRESS || event->button != 3
+    if (!gdk_event_triggers_context_menu((GdkEvent *) event)
         || event->window != gtk_tree_view_get_bin_window(tree_view))
         return FALSE;
 
diff --git a/src/balsa-mblist.c b/src/balsa-mblist.c
index 02b4eee..dab9b53 100644
--- a/src/balsa-mblist.c
+++ b/src/balsa-mblist.c
@@ -691,7 +691,7 @@ bmbl_button_press_cb(GtkWidget * widget, GdkEventButton * event,
     GtkTreeView *tree_view = GTK_TREE_VIEW(widget);
     GtkTreePath *path;
 
-    if (event->type != GDK_BUTTON_PRESS || event->button != 3
+    if (!gdk_event_triggers_context_menu((GdkEvent *) event)
         || event->window != gtk_tree_view_get_bin_window(tree_view))
         return FALSE;
 
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 57a62b2..31b24aa 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -1040,7 +1040,7 @@ tree_button_press_cb(GtkWidget * widget, GdkEventButton * event,
 
     g_return_val_if_fail(bm, FALSE);
     g_return_val_if_fail(event, FALSE);
-    if (event->type != GDK_BUTTON_PRESS || event->button != 3
+    if (!gdk_event_triggers_context_menu((GdkEvent *) event)
         || event->window != gtk_tree_view_get_bin_window(tree_view))
         return FALSE;
 
diff --git a/src/balsa-mime-widget-image.c b/src/balsa-mime-widget-image.c
index 5e373bc..a0f5278 100644
--- a/src/balsa-mime-widget-image.c
+++ b/src/balsa-mime-widget-image.c
@@ -176,7 +176,7 @@ static gboolean
 balsa_image_button_press_cb(GtkWidget * widget, GdkEventButton * event,
                             GtkMenu * menu)
 {
-    if (menu && event->type == GDK_BUTTON_PRESS && event->button == 3) {
+    if (gdk_event_triggers_context_menu((GdkEvent *) event)) {
 #if GTK_CHECK_VERSION(3, 22, 0)
         gtk_menu_popup_at_pointer(menu, (GdkEvent *) event);
 #else                           /*GTK_CHECK_VERSION(3, 22, 0) */
diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c
index a209d75..44ba50d 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -1149,7 +1149,7 @@ static gboolean
 balsa_gtk_html_button_press_cb(GtkWidget * html, GdkEventButton * event,
                                BalsaMessage * bm)
 {
-    return ((event->type == GDK_BUTTON_PRESS && event->button == 3)
+    return (gdk_event_triggers_context_menu((GdkEvent *) event)
             ? balsa_gtk_html_popup(html, bm) : FALSE);
 }
 
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 225e513..8eab501 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -2449,7 +2449,7 @@ attachment_button_press_cb(GtkWidget * widget, GdkEventButton * event,
     GtkTreePath *path;
 
     g_return_val_if_fail(event, FALSE);
-    if (event->type != GDK_BUTTON_PRESS || event->button != 3
+    if (!gdk_event_triggers_context_menu((GdkEvent *) event)
         || event->window != gtk_tree_view_get_bin_window(tree_view))
         return FALSE;