aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2003-12-25 22:48:12 +0800
committerChristian Persch <chpe@src.gnome.org>2003-12-25 22:48:12 +0800
commiteb4ff191acf324ac1d789f1160f10afe5ea4dd2f (patch)
tree0019f52b69281a421fbba6c07e47d076b7d9b40e /embed
parent1869f5b40756ca14c79f123f68d68579a8003163 (diff)
downloadgsoc2013-epiphany-eb4ff191acf324ac1d789f1160f10afe5ea4dd2f.tar
gsoc2013-epiphany-eb4ff191acf324ac1d789f1160f10afe5ea4dd2f.tar.gz
gsoc2013-epiphany-eb4ff191acf324ac1d789f1160f10afe5ea4dd2f.tar.bz2
gsoc2013-epiphany-eb4ff191acf324ac1d789f1160f10afe5ea4dd2f.tar.lz
gsoc2013-epiphany-eb4ff191acf324ac1d789f1160f10afe5ea4dd2f.tar.xz
gsoc2013-epiphany-eb4ff191acf324ac1d789f1160f10afe5ea4dd2f.tar.zst
gsoc2013-epiphany-eb4ff191acf324ac1d789f1160f10afe5ea4dd2f.zip
Bring ephy_window_get_toolbar signature in line with
2003-12-25 Christian Persch <chpe@cvs.gnome.org> * src/ephy-window.c: (ephy_window_get_toolbar), (ephy_window_set_zoom): * src/ephy-window.h: * src/window-commands.c: (window_cmd_edit_toolbar), (window_cmd_load_location): Bring ephy_window_get_toolbar signature in line with ephy_window_get_[statusbar|notebook]. 2003-12-24 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EventContext.cpp: GDK_Meta_L is a keycode, not a modifier code. Map meta to GDK_MOD2_MASK.
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/EventContext.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index b67cd7231..985b7ff23 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -698,7 +698,7 @@ nsresult EventContext::GetMouseEventInfo (nsIDOMMouseEvent *aMouseEvent, EphyEmb
if (mod_key) info->modifier |= GDK_SHIFT_MASK;
aMouseEvent->GetMetaKey(&mod_key);
- if (mod_key) info->modifier |= GDK_Meta_L;
+ if (mod_key) info->modifier |= GDK_MOD2_MASK;
aMouseEvent->GetCtrlKey(&mod_key);
if (mod_key) info->modifier |= GDK_CONTROL_MASK;
@@ -758,7 +758,7 @@ nsresult EventContext::GetKeyEventInfo (nsIDOMKeyEvent *aKeyEvent, EphyEmbedEven
if (mod_key) info->modifier |= GDK_SHIFT_MASK;
aKeyEvent->GetMetaKey(&mod_key);
- if (mod_key) info->modifier |= GDK_Meta_L;
+ if (mod_key) info->modifier |= GDK_MOD2_MASK;
aKeyEvent->GetCtrlKey(&mod_key);
if (mod_key) info->modifier |= GDK_CONTROL_MASK;