diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 38 | ||||
| -rw-r--r-- | embed/mozilla/GlobalHistory.cpp | 76 | ||||
| -rw-r--r-- | embed/mozilla/GlobalHistory.h | 4 |
4 files changed, 10 insertions, 116 deletions
@@ -1,5 +1,13 @@ 2005-01-01 Christian Persch <chpe@cvs.gnome.org> + * configure.ac: + * embed/mozilla/GlobalHistory.cpp: + * embed/mozilla/GlobalHistory.h: + + We don't need to implement nsIBrowserHistory. + +2005-01-01 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-notebook.c: (close_button_clicked_cb), (build_tab_label): * src/ephy-tab.c: (ephy_tab_grab_focus), (ephy_tab_class_init): diff --git a/configure.ac b/configure.ac index 583f6ea85..dcaea7d15 100644 --- a/configure.ac +++ b/configure.ac @@ -326,44 +326,6 @@ AC_DEFINE_UNQUOTED([MOZ_NSICONTENTPOLICY_VARIANT], [$variant], [Define the nsICo AC_MSG_RESULT([variant $variant]) -dnl Changed from char* to nsIURI* in 1.7.4 on 1.7 branch, -dnl in 1.8a3 on trunk and on aviary branch - -AC_MSG_CHECKING([whether nsIBrowserHistory methods expect nsIURI*]) - -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <nsIURI.h> - #include <nsIGlobalHistory.h> - #include <docshell/nsIGlobalHistory2.h> - #include <history/nsIBrowserHistory.h>]], - [[nsIBrowserHistory* p; - nsIURI *arg1; - p->RemovePage(arg1);]] - )], - [AC_DEFINE([MOZ_NSIGLOBALHISTORY_NSIURIP],[1],[Define if nsIBrowserHistory methods expect nsIURI*]) result=yes], - [result=no]) - -AC_MSG_RESULT([$result]) - -dnl This is only present in new-toolkit apps - -AC_MSG_CHECKING([for nsIBrowserHistory::AddPageWithDetails]) - -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <nsIURI.h> - #include <nsIGlobalHistory.h> - #include <docshell/nsIGlobalHistory2.h> - #include <history/nsIBrowserHistory.h>]], - [[nsIBrowserHistory *p; - p->AddPageWithDetails(nsnull,nsnull,0);]] - )], - [AC_DEFINE([MOZ_NSIBROWSERHISTORY_ADDPAGEWITHDETAILS],[1],[Define if nsIBrowserHistory::AddPageWithDetails exists]) result=yes], - [result=no]) - -AC_MSG_RESULT([$result]) - dnl changed in 1.8a4 AC_MSG_CHECKING([for whether nsIGlobalHistory2::AddURI takes a referrer]) diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp index 9d9140a35..874eedd96 100644 --- a/embed/mozilla/GlobalHistory.cpp +++ b/embed/mozilla/GlobalHistory.cpp @@ -32,7 +32,7 @@ #include <nsEmbedString.h> #undef MOZILLA_STRICT_API -NS_IMPL_ISUPPORTS2(MozGlobalHistory, nsIGlobalHistory2, nsIBrowserHistory) +NS_IMPL_ISUPPORTS1 (MozGlobalHistory, nsIGlobalHistory2) MozGlobalHistory::MozGlobalHistory () { @@ -132,77 +132,3 @@ NS_IMETHODIMP MozGlobalHistory::SetPageTitle(nsIURI *aURI, const nsAString & aTi return NS_OK; } - -/* void hidePage (in nsIURI url); */ -NS_IMETHODIMP MozGlobalHistory::HidePage(nsIURI *aURI) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -#ifdef MOZ_NSIGLOBALHISTORY_NSIURIP -/* void removePage (in nsIURI aURI); */ -NS_IMETHODIMP MozGlobalHistory::RemovePage(nsIURI *aURI) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -/* void removePagesFromHost (in AUTF8String aHost, in boolean aEntireDomain); */ -NS_IMETHODIMP MozGlobalHistory::RemovePagesFromHost(const nsACString &aHost, - PRBool aEntireDomain) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} -#else -/* void removePage (in string aURL); */ -NS_IMETHODIMP MozGlobalHistory::RemovePage(const char *aURL) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -/* void removePagesFromHost (in string aHost, in boolean aEntireDomain); */ -NS_IMETHODIMP MozGlobalHistory::RemovePagesFromHost(const char *aHost, - PRBool aEntireDomain) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} -#endif - -/* void removeAllPages (); */ -NS_IMETHODIMP MozGlobalHistory::RemoveAllPages() -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -/* readonly attribute AUTF8String lastPageVisited; */ -NS_IMETHODIMP MozGlobalHistory::GetLastPageVisited(nsACString & aLastPageVisited) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -/* readonly attribute PRUint32 count; */ -NS_IMETHODIMP MozGlobalHistory::GetCount(PRUint32 *aCount) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -#ifdef MOZ_NSIGLOBALHISTORY_NSIURIP -/* void markPageAsTyped (in AUTF8String aURI) */ -NS_IMETHODIMP MozGlobalHistory::MarkPageAsTyped(nsIURI *aURI) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} -#else -/* void markPageAsTyped (in string url); */ -NS_IMETHODIMP MozGlobalHistory::MarkPageAsTyped(const char *url) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} -#endif - -#ifdef MOZ_NSIBROWSERHISTORY_ADDPAGEWITHDETAILS -/* void addPageWithDetails (in nsIURI aURI, in wstring aTitle, in long long aLastVisited); */ -NS_IMETHODIMP MozGlobalHistory::AddPageWithDetails(nsIURI *aURI, const PRUnichar *aTitle, PRInt64 aLastVisited) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} -#endif diff --git a/embed/mozilla/GlobalHistory.h b/embed/mozilla/GlobalHistory.h index b8743caf0..992819a1e 100644 --- a/embed/mozilla/GlobalHistory.h +++ b/embed/mozilla/GlobalHistory.h @@ -24,7 +24,6 @@ #include "ephy-history.h" -#include <nsIBrowserHistory.h> #include <nsIGlobalHistory2.h> #include <nsCOMPtr.h> @@ -41,7 +40,7 @@ { 0xb7, 0x9e, 0xf7, 0xaa, 0x49, 0xeb, 0x6a, 0x15} \ } -class MozGlobalHistory: public nsIBrowserHistory +class MozGlobalHistory: public nsIGlobalHistory2 { public: MozGlobalHistory (); @@ -49,7 +48,6 @@ class MozGlobalHistory: public nsIBrowserHistory NS_DECL_ISUPPORTS NS_DECL_NSIGLOBALHISTORY2 - NS_DECL_NSIBROWSERHISTORY private: EphyHistory *mGlobalHistory; |