diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-09-13 18:24:56 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-09-13 18:24:56 +0800 |
| commit | 2606279995f614634062e0aeb9833c482db5d083 (patch) | |
| tree | 625e6ae5d03052e753c3322397b41f4174ca3926 /embed/mozilla | |
| parent | 79ec35d68d698710604fd4e9682188ae28ba1ae0 (diff) | |
| download | gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.gz gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.bz2 gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.lz gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.xz gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.zst gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.zip | |
Merging pre-gnome-2-10 branch to HEAD.
2004-09-13 Christian Persch <chpe@cvs.gnome.org>
Merging pre-gnome-2-10 branch to HEAD.
Splitting ChangeLog.
Diffstat (limited to 'embed/mozilla')
| -rw-r--r-- | embed/mozilla/EventContext.cpp | 5 | ||||
| -rw-r--r-- | embed/mozilla/MozDownload.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp index 1f7d27bd4..c3891bc5f 100644 --- a/embed/mozilla/EventContext.cpp +++ b/embed/mozilla/EventContext.cpp @@ -653,8 +653,9 @@ nsresult EventContext::GetMouseEventInfo (nsIDOMMouseEvent *aMouseEvent, Mozilla aMouseEvent->GetShiftKey(&mod_key); if (mod_key) info->modifier |= GDK_SHIFT_MASK; - aMouseEvent->GetMetaKey(&mod_key); - if (mod_key) info->modifier |= GDK_MOD2_MASK; + /* no need to check GetMetaKey, it's always PR_FALSE, + * see widget/src/gtk2/nsWindow.cpp:InitMouseEvent + */ aMouseEvent->GetCtrlKey(&mod_key); if (mod_key) info->modifier |= GDK_CONTROL_MASK; diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp index 9070b6caa..7e25a1faa 100644 --- a/embed/mozilla/MozDownload.cpp +++ b/embed/mozilla/MozDownload.cpp @@ -69,7 +69,7 @@ MozDownload::MozDownload() : mMaxSize(-1), mStatus(NS_OK), mEmbedPersist(nsnull), - mDownloadState(EPHY_DOWNLOAD_DOWNLOADING) + mDownloadState(EPHY_DOWNLOAD_INITIALISING) { LOG ("MozDownload ctor (%p)", (void *) this) } |