[epiphany/gnome-3-18] title-box: Do not propagate button press events in title mode

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 8ea4d95748073e8cff6b3cab14492e2469ab9db1
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Thu Feb 25 21:35:15 2016 -0600

    title-box: Do not propagate button press events in title mode
    
    This is a speculative fix for the problem where clicking at just the
    right spot in the header bar opens the security popover via the security
    indicator in the hidden location entry. I haven't found any good way to
    reproduce this problem, unfortunately, but it happens regularly and I
    think there's a good chance this will fix it.
    
    This works because there's nothing inside the title box that users
    should be allowed to click on when in title mode, except for the
    security indicator, which is handled in this very function.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=744307

 src/ephy-title-box.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/ephy-title-box.c b/src/ephy-title-box.c
index 932a07a..5305229 100644
--- a/src/ephy-title-box.c
+++ b/src/ephy-title-box.c
@@ -332,10 +332,12 @@ ephy_title_box_button_press_event (GtkWidget      *widget,
   EphyTitleBoxPrivate *priv = ephy_title_box_get_instance_private (title_box);
   GtkAllocation        lock_allocation;
 
-  if (priv->mode != EPHY_TITLE_BOX_MODE_TITLE
-      || event->button != GDK_BUTTON_PRIMARY)
+  if (priv->mode != EPHY_TITLE_BOX_MODE_TITLE)
     return GDK_EVENT_PROPAGATE;
 
+  if (event->button != GDK_BUTTON_PRIMARY)
+    return GDK_EVENT_STOP;
+
   LOG ("button-press-event title-box %p event %p", title_box, event);
 
   gtk_widget_get_allocation (priv->lock_image, &lock_allocation);
@@ -352,7 +354,7 @@ ephy_title_box_button_press_event (GtkWidget      *widget,
     ephy_title_box_cancel_switch_to_entry_after_double_click_time (title_box);
   }
 
-  return GDK_EVENT_PROPAGATE;
+  return GDK_EVENT_STOP;
 }
 
 static void