aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/EphySidebar.cpp4
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 31ba3bc57..520b29393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-04 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/EphySidebar.cpp:
+
+ The API change was reverted on 1.8 branch. Fixes bug #343592.
+
2006-06-01 Jean-François Rameau <jframeau@cvs.gnome.org>
* embed/ephy-embed-persist.h:
diff --git a/embed/mozilla/EphySidebar.cpp b/embed/mozilla/EphySidebar.cpp
index 2a60eb1f4..0076c528b 100644
--- a/embed/mozilla/EphySidebar.cpp
+++ b/embed/mozilla/EphySidebar.cpp
@@ -36,11 +36,7 @@
#include "EphySidebar.h"
-#ifdef MOZILLA_1_8_BRANCH
-NS_IMPL_ISUPPORTS2_CI(EphySidebar, nsISidebar, nsISidebar_MOZILLA_1_8_BRANCH)
-#else
NS_IMPL_ISUPPORTS1_CI(EphySidebar, nsISidebar)
-#endif
EphySidebar::EphySidebar()
{