aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--embed/ephy-embed-prefs.c5
-rw-r--r--src/ephy-window.c7
2 files changed, 10 insertions, 2 deletions
diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c
index a7465db10..82885faf1 100644
--- a/embed/ephy-embed-prefs.c
+++ b/embed/ephy-embed-prefs.c
@@ -251,7 +251,10 @@ ephy_embed_prefs_init (void)
settings = webkit_web_settings_new ();
/* Hardcoded settings */
- g_object_set (settings, "auto-shrink-images", FALSE, NULL);
+ g_object_set (settings,
+ "auto-shrink-images", FALSE,
+ "enable-default-context-menu", FALSE,
+ NULL);
/* Connections */
connections = g_malloc (sizeof (guint) * G_N_ELEMENTS (webkit_pref_entries));
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 0f2ceed43..2780aaed0 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2862,9 +2862,14 @@ ephy_window_set_active_tab (EphyWindow *window, EphyEmbed *new_embed)
g_signal_connect_object (view, "notify::progress",
G_CALLBACK (sync_tab_load_progress),
window, 0);
+ /* We run our button-press-event after the default
+ * handler to make sure pages have a chance to perform
+ * their own handling - for instance, have their own
+ * context menus, or provide specific functionality
+ * for the right mouse button */
g_signal_connect_object (view, "button-press-event",
G_CALLBACK (ephy_window_dom_mouse_click_cb),
- window, 0);
+ window, G_CONNECT_AFTER);
g_signal_connect_object (view, "notify::visibility",
G_CALLBACK (ephy_window_visibility_cb),
window, 0);