diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | embed/mozilla/GlobalHistory.cpp | 2 |
3 files changed, 12 insertions, 5 deletions
@@ -1,5 +1,13 @@ 2005-01-09 Christian Persch <chpe@cvs.gnome.org> + * configure.ac: + * embed/mozilla/GlobalHistory.cpp: + + Don't check for nsIBrowserHistory. + +2005-01-09 Christian Persch <chpe@cvs.gnome.org> + + * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp: Add mnemonic to Send button. diff --git a/configure.ac b/configure.ac index e13e4b9e8..a68f3e98b 100644 --- a/configure.ac +++ b/configure.ac @@ -335,12 +335,11 @@ AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[#include <nsIURI.h> #include <nsIGlobalHistory.h> - #include <docshell/nsIGlobalHistory2.h> - #include <history/nsIBrowserHistory.h>]], - [[nsIBrowserHistory *p; + #include <docshell/nsIGlobalHistory2.h>]], + [[nsIGlobalHistory2 *p; p->AddURI(nsnull,PR_FALSE,PR_FALSE,nsnull);]] )], - [AC_DEFINE([MOZ_NSIBROWSERHISTORY_ADDURI_WITH_REFERRER],[1],[Define if nsIGlobalHistory2::AddURI takes a referrer]) result=yes], + [AC_DEFINE([MOZ_NSIGLOBALHISTORY2_ADDURI_WITH_REFERRER],[1],[Define if nsIGlobalHistory2::AddURI takes a referrer]) result=yes], [result=no]) AC_MSG_RESULT([$result]) diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp index 874eedd96..b5bf2e3bb 100644 --- a/embed/mozilla/GlobalHistory.cpp +++ b/embed/mozilla/GlobalHistory.cpp @@ -46,7 +46,7 @@ MozGlobalHistory::~MozGlobalHistory () { } -#ifdef MOZ_NSIBROWSERHISTORY_ADDURI_WITH_REFERRER +#ifdef MOZ_NSIGLOBALHISTORY2_ADDURI_WITH_REFERRER /* void addURI (in nsIURI aURI, in boolean aRedirect, in boolean aToplevel, in nsIURI aReferrer); */ NS_IMETHODIMP MozGlobalHistory::AddURI(nsIURI *aURI, PRBool aRedirect, PRBool aToplevel, nsIURI *aReferrer) #else |