diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | embed/mozilla/EphyBrowser.cpp | 62 | ||||
| -rw-r--r-- | embed/mozilla/EphyBrowser.h | 28 |
3 files changed, 53 insertions, 49 deletions
@@ -1,3 +1,15 @@ +2004-04-29 Marco Pesenti Gritti <marco@gnome.org> + + * configure.in: + * embed/mozilla/EphyBrowser.cpp: + * embed/mozilla/EphyBrowser.h: + * embed/mozilla/Makefile.am: + + Add defines for private mozilla api usage. It will + make easier to track what we need to port to embed + string and what we need to be using only public api + (on the long time). + 2004-04-28 Piers Cornwell <piers@gnome.org> * help/C/epiphany.xml: diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp index 54697db81..4b0353c3e 100644 --- a/embed/mozilla/EphyBrowser.cpp +++ b/embed/mozilla/EphyBrowser.cpp @@ -24,6 +24,7 @@ #include "EphyBrowser.h" #include "GlobalHistory.h" +#include "ContentHandler.h" #include "ephy-embed.h" #include "ephy-string.h" #include "ephy-debug.h" @@ -31,57 +32,50 @@ #include <gtkmozembed_internal.h> #include <unistd.h> -#include "nsICommandManager.h" +#include "nsIInterfaceRequestorUtils.h" +#include "nsIURI.h" +#include "nsISimpleEnumerator.h" + #include "nsIContentViewer.h" #include "nsIGlobalHistory.h" -#include "nsIDocShellHistory.h" #include "nsIWebBrowserFind.h" #include "nsIWebBrowserFocus.h" -#include "nsIDocument.h" -#include "nsISHEntry.h" -#include "nsISHistoryInternal.h" -#include "nsIHistoryEntry.h" +#include "nsICommandManager.h" #include "nsIWebBrowserPrint.h" -#include "nsIURI.h" -#include "nsIMarkupDocumentViewer.h" -#include "nsIComponentManager.h" -#include "nsIScriptGlobalObject.h" -#include "nsIDOMWindowInternal.h" -#include "nsIInterfaceRequestor.h" -#include "nsIFocusController.h" -#include "nsIWebBrowserPersist.h" -#include "nsCWebBrowserPersist.h" -#include "nsNetUtil.h" -#include "nsIChromeEventHandler.h" -#include "nsIDOMDocument.h" -#include "nsIDOMDocumentStyle.h" -#include "nsIDOMEvent.h" -#include "nsIDOMEventTarget.h" -#include "nsIDOMNode.h" -#include "nsIDOMElement.h" #include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeNode.h" #include "nsIDocShellTreeOwner.h" -#include "nsICSSLoader.h" -#include "nsICSSStyleSheet.h" -#include "nsICSSLoaderObserver.h" -#include "nsIDocumentObserver.h" -#include "nsCWebBrowser.h" -#include "nsReadableUtils.h" -#include "nsIDOMNSHTMLDocument.h" +#include "nsIDocumentCharsetInfo.h" +#include "nsIWebPageDescriptor.h" +#include "nsISHEntry.h" +#include "nsIHistoryEntry.h" #include "nsIDOMHTMLDocument.h" #include "nsIDOMHTMLCollection.h" #include "nsIDOMHTMLElement.h" #include "nsIDOMHTMLFormElement.h" #include "nsIDOMHTMLInputElement.h" #include "nsIDOMHTMLTextAreaElement.h" +#include "nsIDOMDocument.h" +#include "nsIDOMEvent.h" +#include "nsIDOMEventTarget.h" +#include "nsIDOMNode.h" +#include "nsIDOMElement.h" + +#ifdef ALLOW_PRIVATE_API +#include "nsPIDOMWindow.h" +#include "nsIMarkupDocumentViewer.h" +#include "nsIChromeEventHandler.h" +#include "nsIDOMWindowInternal.h" +#endif + +#ifdef ALLOW_PRIVATE_STRINGS +#include "nsString.h" +#include "nsReadableUtils.h" +#include "nsIDocument.h" #include "nsIDeviceContext.h" #include "nsIPresContext.h" #include "nsIAtom.h" -#include "nsIDocumentCharsetInfo.h" -#include "nsPromiseFlatString.h" -#include "nsString.h" -#include "ContentHandler.h" +#endif EphyEventListener::EphyEventListener(void) { diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h index 6569cd502..16a967c3b 100644 --- a/embed/mozilla/EphyBrowser.h +++ b/embed/mozilla/EphyBrowser.h @@ -24,21 +24,20 @@ #include "ephy-encodings.h" #include "ephy-embed.h" -#include "nsIDOMEventListener.h" -#include "nsIDocShell.h" -#include "nsIWebNavigation.h" -#include "nsIWebPageDescriptor.h" -#include "nsISHistory.h" -#include "nsIWebBrowser.h" -#include "nsIWebProgressListener.h" -#include "nsCOMPtr.h" -#include "nsIDOMEventReceiver.h" -#include "nsIDOMDocument.h" -#include "nsIDOMWindow.h" -#include "nsPIDOMWindow.h" #include <gtkmozembed.h> - -#include "nsIPrintSettings.h" +#include <nsCOMPtr.h> +#include <nsIDOMEventListener.h> +#include <nsIWebNavigation.h> +#include <nsISHistory.h> +#include <nsIWebBrowser.h> +#include <nsIDOMDocument.h> +#include <nsIDOMWindow.h> +#include <nsIPrintSettings.h> + +#ifdef ALLOW_PRIVATE_API +#include <nsIDocShell.h> +#include <nsIDOMEventReceiver.h> +#endif class EphyEventListener : public nsIDOMEventListener { @@ -119,7 +118,6 @@ public: private: nsCOMPtr<nsIDOMDocument> mTargetDocument; - nsCOMPtr<nsIWebProgressListener> mProgress; nsCOMPtr<nsIDOMEventReceiver> mEventReceiver; nsCOMPtr<nsIDOMWindow> mDOMWindow; EphyFaviconEventListener *mFaviconEventListener; |