diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | embed/ephy-history.c | 6 | ||||
| -rw-r--r-- | embed/mozilla/GlobalHistory.cpp | 8 |
4 files changed, 25 insertions, 10 deletions
@@ -1,3 +1,13 @@ +2003-05-28 Marco Pesenti Gritti <marco@it.gnome.org> + + * configure.in: + * embed/ephy-history.c: (ephy_history_clear): + * embed/mozilla/GlobalHistory.cpp: + + Make it build with mozilla cvs. + Remove only pages on history clear, the sites + are automatically removed (fix freeze). + 2003-05-27 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/mozilla-embed-single.cpp (impl_get_charset_groups): diff --git a/configure.in b/configure.in index b52ff8fa1..8772afe56 100644 --- a/configure.in +++ b/configure.in @@ -180,8 +180,8 @@ MOZILLA_VERSION="`$PKG_CONFIG --modversion mozilla-gtkmozembed`" dnl allow user to override the autodetected mozilla version dnl - without arguments for cvs head AC_ARG_WITH(mozilla-snapshot, - AC_HELP_STRING([--with-mozilla-snapshot@<:@=1.3|1.3.1|1.4a|trunk@:>@], - [Whether to try building against mozilla 1.3|1.3.1|1.4a|trunk + AC_HELP_STRING([--with-mozilla-snapshot@<:@=1.3|1.3.1|1.4a|1.4|trunk@:>@], + [Whether to try building against mozilla 1.3|1.3.1|1.4a|1.4|trunk snapshot. @<:@guessed@:>@]), [autodetect=" (guessed: $MOZILLA_VERSION)"; MOZILLA_VERSION="$withval"]) @@ -193,10 +193,11 @@ case "$MOZILLA_VERSION" in "") MOZILLA_SNAPSHOT=7 ;; 1.4a) MOZILLA_SNAPSHOT=7 ;; 1.4b) MOZILLA_SNAPSHOT=7 ;; -trunk) MOZILLA_SNAPSHOT=7 ;; + 1.4) MOZILLA_SNAPHOST=8 ;; +trunk) MOZILLA_SNAPSHOT=8 ;; *) AC_ERROR([ ***************************************************************************** -Epiphany can be built using mozilla 1.3, 1.3.1, 1.4a, 1.4b or trunk snapshot, but the +Epiphany can be built using mozilla 1.3, 1.3.1, 1.4a, 1.4b, 1.4 or trunk snapshot, but the version available is $MOZILLA_VERSION. When using mozilla trunk snapshot successful build is not guaranteed due to @@ -205,6 +206,8 @@ resources of the epiphany team to support non-release mozilla snapshots. *****************************************************************************]) esac +AC_DEFINE_UNQUOTED(MOZILLA_SNAPSHOT, $MOZILLA_SNAPSHOT, [Define mozilla snapshot]) + dnl ******************************* dnl Internationalization dnl ******************************* diff --git a/embed/ephy-history.c b/embed/ephy-history.c index 525e13326..f93982aad 100644 --- a/embed/ephy-history.c +++ b/embed/ephy-history.c @@ -860,12 +860,6 @@ ephy_history_clear (EphyHistory *gh) ephy_node_unref (node); } - /* The first node is All, dont unref it */ - while ((node = ephy_node_get_nth_child (gh->priv->hosts, 1)) != NULL) - { - ephy_node_unref (node); - } - ephy_history_save (gh); } diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp index 09c2c994a..034c8a94c 100644 --- a/embed/mozilla/GlobalHistory.cpp +++ b/embed/mozilla/GlobalHistory.cpp @@ -16,6 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "ephy-embed-shell.h" #include "GlobalHistory.h" #include "nsCOMPtr.h" @@ -103,6 +107,8 @@ NS_IMETHODIMP MozGlobalHistory::GetCount(PRUint32 *aCount) { return NS_ERROR_NOT_IMPLEMENTED; } + +#if MOZILLA_SNAPSHOT <= 7 /* void startBatchUpdate (); */ NS_IMETHODIMP MozGlobalHistory::StartBatchUpdate() @@ -116,6 +122,8 @@ NS_IMETHODIMP MozGlobalHistory::EndBatchUpdate() return NS_ERROR_NOT_IMPLEMENTED; } +#endif + /* void markPageAsTyped (in string url); */ NS_IMETHODIMP MozGlobalHistory::MarkPageAsTyped(const char *url) { |