diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | embed/mozilla/GlobalHistory.cpp | 2 | ||||
| -rw-r--r-- | src/ephy-main.c | 10 |
4 files changed, 21 insertions, 3 deletions
@@ -1,5 +1,15 @@ 2004-02-12 Christian Persch <chpe@cvs.gnome.org> + * configure.in: + + Depend on libxml2 >= 2.6.6 because of bug #133298 and bug # 131548. + + * src/ephy-main.c: (main): + + Use LIBXML_TEST_VERSION to check for API compatibility. + +2004-02-12 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/GlobalHistory.cpp: Fix compilation with mozilla 1.4. diff --git a/configure.in b/configure.in index c8a54cab2..f561a894f 100644 --- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" GLIB_REQUIRED=2.3.1 GTK_REQUIRED=2.3.2 LIBBONOBOUI_REQUIRED=2.1.1 -LIBXML_REQUIRED=2.6.0 +LIBXML_REQUIRED=2.6.6 LIBGNOMEVFS_REQUIRED=2.3.1 LIBGLADE_REQUIRED=2.3.1 LIBNAUTILUS_REQUIRED=2.5 diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp index 0f296f0f4..f2df7203b 100644 --- a/embed/mozilla/GlobalHistory.cpp +++ b/embed/mozilla/GlobalHistory.cpp @@ -60,7 +60,7 @@ NS_IMETHODIMP MozGlobalHistory::AddURI(nsIURI *aURI, PRBool aRedirect, PRBool aT return NS_OK; } -//* boolean isVisited (in nsIURI aURI); */ +/* boolean isVisited (in nsIURI aURI); */ NS_IMETHODIMP MozGlobalHistory::IsVisited(nsIURI *aURI, PRBool *_retval) { nsCAutoString spec; diff --git a/src/ephy-main.c b/src/ephy-main.c index f2240e76b..1bf5520f7 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -14,10 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif #include "ephy-shell.h" @@ -35,6 +37,7 @@ #include <glib/gi18n.h> #include <glade/glade-init.h> #include <libgnomevfs/gnome-vfs-init.h> +#include <libxml/xmlversion.h> static gboolean open_in_existing = FALSE; static gboolean open_in_new_tab = FALSE; @@ -97,6 +100,11 @@ main (int argc, char *argv[]) textdomain(GETTEXT_PACKAGE); #endif + /* check libxml2 API version epiphany was compiled with against the + * version we're running with. + */ + LIBXML_TEST_VERSION + g_set_application_name (_("Epiphany Web Browser")); program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, |