[eog/gnome-3-18] Revert "EogScrollView: Allow triggering popup menu via Shift+F10"
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog/gnome-3-18] Revert "EogScrollView: Allow triggering popup menu via Shift+F10"
- Date: Wed, 21 Oct 2015 19:11:18 +0000 (UTC)
commit b707c2d196092ca956a11f61d9477423de05cb64
Author: Felix Riemann <friemann gnome org>
Date: Wed Oct 21 21:10:42 2015 +0200
Revert "EogScrollView: Allow triggering popup menu via Shift+F10"
This reverts commit 6c8285c58cabefec57784af407d1db2e542fc1af.
src/eog-scroll-view.c | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
---
diff --git a/src/eog-scroll-view.c b/src/eog-scroll-view.c
index 8b7b13d..47ba09d 100644
--- a/src/eog-scroll-view.c
+++ b/src/eog-scroll-view.c
@@ -2744,23 +2744,15 @@ static gboolean
view_on_button_press_event_cb (GtkWidget *view, GdkEventButton *event,
gpointer user_data)
{
- /* Ignore double-clicks and triple-clicks */
- if (gdk_event_triggers_context_menu ((const GdkEvent*) event)
- && event->type == GDK_BUTTON_PRESS)
- {
- eog_scroll_view_popup_menu (EOG_SCROLL_VIEW (view), event);
+ /* Ignore double-clicks and triple-clicks */
+ if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+ {
+ eog_scroll_view_popup_menu (EOG_SCROLL_VIEW (view), event);
- return TRUE;
- }
+ return TRUE;
+ }
- return FALSE;
-}
-
-static gboolean
-eog_scroll_view_popup_menu_handler (GtkWidget *widget, gpointer user_data)
-{
- eog_scroll_view_popup_menu (EOG_SCROLL_VIEW (widget), NULL);
- return TRUE;
+ return FALSE;
}
void
@@ -2778,8 +2770,6 @@ eog_scroll_view_set_popup (EogScrollView *view,
g_signal_connect (G_OBJECT (view), "button_press_event",
G_CALLBACK (view_on_button_press_event_cb), NULL);
- g_signal_connect (G_OBJECT (view), "popup-menu",
- G_CALLBACK (eog_scroll_view_popup_menu_handler), NULL);
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]