epiphany r8177 - trunk/embed/mozilla
- From: chpe svn gnome org
- To: svn-commits-list gnome org
- Subject: epiphany r8177 - trunk/embed/mozilla
- Date: Tue, 1 Apr 2008 01:27:48 +0100 (BST)
Author: chpe
Date: Tue Apr 1 01:27:48 2008
New Revision: 8177
URL: http://svn.gnome.org/viewvc/epiphany?rev=8177&view=rev
Log:
Try harder to fix the build with gecko 1.8
Modified:
trunk/embed/mozilla/EphyBrowser.cpp
Modified: trunk/embed/mozilla/EphyBrowser.cpp
==============================================================================
--- trunk/embed/mozilla/EphyBrowser.cpp (original)
+++ trunk/embed/mozilla/EphyBrowser.cpp Tue Apr 1 01:27:48 2008
@@ -825,7 +825,9 @@
, mDOMScrollEventListener(nsnull)
, mPopupBlockEventListener(nsnull)
, mModalAlertListener(nsnull)
+#ifdef HAVE_GECKO_1_9
, mCommandEventListener(nsnull)
+#endif
, mContextMenuListener(nsnull)
, mInitialized(PR_FALSE)
{
@@ -874,8 +876,10 @@
mModalAlertListener = new EphyModalAlertEventListener (this);
if (!mModalAlertListener) return NS_ERROR_OUT_OF_MEMORY;
+#ifdef HAVE_GECKO_1_9
mCommandEventListener = new EphyCommandEventListener(this);
if (!mCommandEventListener) return NS_ERROR_OUT_OF_MEMORY;
+#endif
mContextMenuListener = new EphyContextMenuListener(this);
if (!mContextMenuListener) return NS_ERROR_OUT_OF_MEMORY;
@@ -943,8 +947,10 @@
mModalAlertListener, PR_TRUE, PR_FALSE);
rv |= target->AddEventListener(NS_LITERAL_STRING ("DOMModalDialogClosed"),
mModalAlertListener, PR_TRUE, PR_FALSE);
+#ifdef HAVE_GECKO_1_9
rv |= target->AddEventListener(NS_LITERAL_STRING ("command"),
mCommandEventListener, PR_FALSE, PR_FALSE);
+#endif
rv |= target->AddEventListener(NS_LITERAL_STRING ("contextmenu"),
mContextMenuListener, PR_TRUE /* capture */, PR_FALSE);
NS_ENSURE_SUCCESS (rv, rv);
@@ -972,8 +978,10 @@
mModalAlertListener, PR_TRUE);
rv |= mEventTarget->RemoveEventListener(NS_LITERAL_STRING ("DOMModalDialogClosed"),
mModalAlertListener, PR_TRUE);
+#ifdef HAVE_GECKO_1_9
rv |= mEventTarget->RemoveEventListener(NS_LITERAL_STRING ("command"),
mCommandEventListener, PR_FALSE);
+#endif
rv |= mEventTarget->RemoveEventListener(NS_LITERAL_STRING ("contextmenu"),
mContextMenuListener, PR_TRUE /* capture */);
NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]