aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-03-07 02:40:41 +0800
committerChristian Persch <chpe@src.gnome.org>2004-03-07 02:40:41 +0800
commit7c42de499225ffa0e144277c6b20e05fc9a11e6d (patch)
tree60e82aa0789bb4f72b5164693c214fbea9d2a639
parent12b1cf2ad66f85ea1cde61fd141014e9b4a0e5a1 (diff)
downloadgsoc2013-epiphany-7c42de499225ffa0e144277c6b20e05fc9a11e6d.tar
gsoc2013-epiphany-7c42de499225ffa0e144277c6b20e05fc9a11e6d.tar.gz
gsoc2013-epiphany-7c42de499225ffa0e144277c6b20e05fc9a11e6d.tar.bz2
gsoc2013-epiphany-7c42de499225ffa0e144277c6b20e05fc9a11e6d.tar.lz
gsoc2013-epiphany-7c42de499225ffa0e144277c6b20e05fc9a11e6d.tar.xz
gsoc2013-epiphany-7c42de499225ffa0e144277c6b20e05fc9a11e6d.tar.zst
gsoc2013-epiphany-7c42de499225ffa0e144277c6b20e05fc9a11e6d.zip
Also pop up the context menu with the menu key.
2004-03-06 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/mozilla-embed.cpp: Also pop up the context menu with the menu key.
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/mozilla-embed.cpp11
2 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 367bed248..24795e72a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-03-06 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/mozilla-embed.cpp:
+
+ Also pop up the context menu with the menu key.
+
+2004-03-06 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-main.c: (main):
Persist changed accels with gnome_accelerator_sync().
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index fda58e858..89309eab7 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -18,6 +18,10 @@
* $Id$
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "mozilla-embed.h"
#include "mozilla-embed-event.h"
#include "ephy-embed-shell.h"
@@ -832,9 +836,14 @@ mozilla_embed_dom_key_down_cb (GtkMozEmbed *embed, gpointer dom_event,
rv = ctx.GetKeyEventInfo (ev, info);
if (NS_FAILED (rv)) return ret;
- if (info->keycode == nsIDOMKeyEvent::DOM_VK_F10 &&
+ if ((info->keycode == nsIDOMKeyEvent::DOM_VK_F10 &&
(info->modifier == GDK_SHIFT_MASK ||
info->modifier == GDK_CONTROL_MASK))
+#if MOZILLA_SNAPSHOT > 14
+ || (info->keycode == nsIDOMKeyEvent::DOM_VK_CONTEXT_MENU &&
+ !info->modifier)
+#endif
+ )
{
/* Translate relative coordinates to absolute values, and try
to avoid covering links by adding a little offset. */