epiphany r8679 - in branches/gnome-2-24: . doc/reference doc/reference/tmpl embed embed/webkit embed/xulrunner embed/xulrunner/bindings embed/xulrunner/bindings/python embed/xulrunner/components embed/xulrunner/data embed/xulrunner/embed embed/xulrunner/src embed/xulrunner/tests embed/xulrunner/utils m4 src xulapp

From: chpe svn gnome org
To: svn-commits-list gnome org
Subject: epiphany r8679 - in branches/gnome-2-24: . doc/reference doc/reference/tmpl embed embed/webkit embed/xulrunner embed/xulrunner/bindings embed/xulrunner/bindings/python embed/xulrunner/components embed/xulrunner/data embed/xulrunner/embed embed/xulrunner/src embed/xulrunner/tests embed/xulrunner/utils m4 src xulapp
Date: Mon, 12 Jan 2009 19:22:58 +0000 (UTC)
Author: chpe
Date: Mon Jan 12 19:22:58 2009
New Revision: 8679
URL: http://svn.gnome.org/viewvc/epiphany?rev=8679&view=rev

Log:
Spring cleaning.

Removed:
   branches/gnome-2-24/embed/webkit/Makefile.am
   branches/gnome-2-24/embed/webkit/webkit-embed-find.c
   branches/gnome-2-24/embed/webkit/webkit-embed-find.h
   branches/gnome-2-24/embed/webkit/webkit-embed-persist.c
   branches/gnome-2-24/embed/webkit/webkit-embed-persist.h
   branches/gnome-2-24/embed/webkit/webkit-embed-prefs.c
   branches/gnome-2-24/embed/webkit/webkit-embed-prefs.h
   branches/gnome-2-24/embed/webkit/webkit-embed-single.c
   branches/gnome-2-24/embed/webkit/webkit-embed-single.h
   branches/gnome-2-24/embed/webkit/webkit-embed.c
   branches/gnome-2-24/embed/webkit/webkit-embed.h
   branches/gnome-2-24/embed/webkit/webkit-history-item.c
   branches/gnome-2-24/embed/webkit/webkit-history-item.h
   branches/gnome-2-24/embed/xulrunner/AUTHORS
   branches/gnome-2-24/embed/xulrunner/COPYRIGHT
   branches/gnome-2-24/embed/xulrunner/ChangeLog-preEphy
   branches/gnome-2-24/embed/xulrunner/HACKING
   branches/gnome-2-24/embed/xulrunner/MAINTAINERS
   branches/gnome-2-24/embed/xulrunner/Makefile.am
   branches/gnome-2-24/embed/xulrunner/NEWS
   branches/gnome-2-24/embed/xulrunner/PLAN
   branches/gnome-2-24/embed/xulrunner/README
   branches/gnome-2-24/embed/xulrunner/STATUS
   branches/gnome-2-24/embed/xulrunner/TODO
   branches/gnome-2-24/embed/xulrunner/bindings/Makefile.am
   branches/gnome-2-24/embed/xulrunner/bindings/python/Makefile.am
   branches/gnome-2-24/embed/xulrunner/bindings/python/gnomegeckoembed.defs
   branches/gnome-2-24/embed/xulrunner/bindings/python/gnomegeckoembed.override
   branches/gnome-2-24/embed/xulrunner/bindings/python/gnomegeckoembedmodule.c
   branches/gnome-2-24/embed/xulrunner/bindings/python/test.py
   branches/gnome-2-24/embed/xulrunner/components/ContentHandler.cpp
   branches/gnome-2-24/embed/xulrunner/components/ContentHandler.h
   branches/gnome-2-24/embed/xulrunner/components/EphyAboutModule.cpp
   branches/gnome-2-24/embed/xulrunner/components/EphyAboutModule.h
   branches/gnome-2-24/embed/xulrunner/components/EphyContentPolicy.cpp
   branches/gnome-2-24/embed/xulrunner/components/EphyContentPolicy.h
   branches/gnome-2-24/embed/xulrunner/components/EphyHistoryListener.cpp
   branches/gnome-2-24/embed/xulrunner/components/EphyHistoryListener.h
   branches/gnome-2-24/embed/xulrunner/components/EphyRedirectChannel.cpp
   branches/gnome-2-24/embed/xulrunner/components/EphyRedirectChannel.h
   branches/gnome-2-24/embed/xulrunner/components/EphySidebar.cpp
   branches/gnome-2-24/embed/xulrunner/components/EphySidebar.h
   branches/gnome-2-24/embed/xulrunner/components/FilePicker.cpp
   branches/gnome-2-24/embed/xulrunner/components/FilePicker.h
   branches/gnome-2-24/embed/xulrunner/components/GeckoCookiePromptService.cpp
   branches/gnome-2-24/embed/xulrunner/components/GeckoCookiePromptService.h
   branches/gnome-2-24/embed/xulrunner/components/GeckoFormSigningDialog.cpp
   branches/gnome-2-24/embed/xulrunner/components/GeckoFormSigningDialog.h
   branches/gnome-2-24/embed/xulrunner/components/GeckoPrintService.cpp
   branches/gnome-2-24/embed/xulrunner/components/GeckoPrintService.h
   branches/gnome-2-24/embed/xulrunner/components/GeckoPrintSession.cpp
   branches/gnome-2-24/embed/xulrunner/components/GeckoPrintSession.h
   branches/gnome-2-24/embed/xulrunner/components/GeckoPromptService.cpp
   branches/gnome-2-24/embed/xulrunner/components/GeckoPromptService.h
   branches/gnome-2-24/embed/xulrunner/components/GeckoSpellCheckEngine.cpp
   branches/gnome-2-24/embed/xulrunner/components/GeckoSpellCheckEngine.h
   branches/gnome-2-24/embed/xulrunner/components/GlobalHistory.cpp
   branches/gnome-2-24/embed/xulrunner/components/GlobalHistory.h
   branches/gnome-2-24/embed/xulrunner/components/GtkNSSClientAuthDialogs.cpp
   branches/gnome-2-24/embed/xulrunner/components/GtkNSSClientAuthDialogs.h
   branches/gnome-2-24/embed/xulrunner/components/GtkNSSDialogs.cpp
   branches/gnome-2-24/embed/xulrunner/components/GtkNSSDialogs.h
   branches/gnome-2-24/embed/xulrunner/components/GtkNSSKeyPairDialogs.cpp
   branches/gnome-2-24/embed/xulrunner/components/GtkNSSKeyPairDialogs.h
   branches/gnome-2-24/embed/xulrunner/components/GtkNSSSecurityWarningDialogs.cpp
   branches/gnome-2-24/embed/xulrunner/components/GtkNSSSecurityWarningDialogs.h
   branches/gnome-2-24/embed/xulrunner/components/Makefile.am
   branches/gnome-2-24/embed/xulrunner/components/MozDownload.cpp
   branches/gnome-2-24/embed/xulrunner/components/MozDownload.h
   branches/gnome-2-24/embed/xulrunner/components/MozRegisterComponents.cpp
   branches/gnome-2-24/embed/xulrunner/components/MozRegisterComponents.h
   branches/gnome-2-24/embed/xulrunner/data/Makefile.am
   branches/gnome-2-24/embed/xulrunner/data/gnome-gecko-embed.pc.in
   branches/gnome-2-24/embed/xulrunner/embed/EphyBrowser.cpp
   branches/gnome-2-24/embed/xulrunner/embed/EphyBrowser.h
   branches/gnome-2-24/embed/xulrunner/embed/EphyDirectoryProvider.cpp
   branches/gnome-2-24/embed/xulrunner/embed/EphyDirectoryProvider.h
   branches/gnome-2-24/embed/xulrunner/embed/EphyFind.cpp
   branches/gnome-2-24/embed/xulrunner/embed/EphyFind.h
   branches/gnome-2-24/embed/xulrunner/embed/EphyHeaderSniffer.cpp
   branches/gnome-2-24/embed/xulrunner/embed/EphyHeaderSniffer.h
   branches/gnome-2-24/embed/xulrunner/embed/EphySingle.cpp
   branches/gnome-2-24/embed/xulrunner/embed/EphySingle.h
   branches/gnome-2-24/embed/xulrunner/embed/EventContext.cpp
   branches/gnome-2-24/embed/xulrunner/embed/EventContext.h
   branches/gnome-2-24/embed/xulrunner/embed/Makefile.am
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-download.cpp
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-download.h
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-embed-event.cpp
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-embed-event.h
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-embed-find.cpp
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-embed-find.h
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-embed-persist.cpp
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-embed-persist.h
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-embed-single.cpp
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-embed-single.h
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-embed.cpp
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-embed.h
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-notifiers.cpp
   branches/gnome-2-24/embed/xulrunner/embed/mozilla-notifiers.h
   branches/gnome-2-24/embed/xulrunner/src/EmbedContentListener.cpp
   branches/gnome-2-24/embed/xulrunner/src/EmbedContentListener.h
   branches/gnome-2-24/embed/xulrunner/src/EmbedEventListener.cpp
   branches/gnome-2-24/embed/xulrunner/src/EmbedEventListener.h
   branches/gnome-2-24/embed/xulrunner/src/EmbedProgress.cpp
   branches/gnome-2-24/embed/xulrunner/src/EmbedProgress.h
   branches/gnome-2-24/embed/xulrunner/src/EmbedStream.cpp
   branches/gnome-2-24/embed/xulrunner/src/EmbedStream.h
   branches/gnome-2-24/embed/xulrunner/src/EmbedWindow.cpp
   branches/gnome-2-24/embed/xulrunner/src/EmbedWindow.h
   branches/gnome-2-24/embed/xulrunner/src/EmbedWindowCreator.cpp
   branches/gnome-2-24/embed/xulrunner/src/EmbedWindowCreator.h
   branches/gnome-2-24/embed/xulrunner/src/GeckoBrowser.cpp
   branches/gnome-2-24/embed/xulrunner/src/GeckoBrowser.h
   branches/gnome-2-24/embed/xulrunner/src/GeckoSingle.cpp
   branches/gnome-2-24/embed/xulrunner/src/GeckoSingle.h
   branches/gnome-2-24/embed/xulrunner/src/Makefile.am
   branches/gnome-2-24/embed/xulrunner/src/gecko-dom-event-internal.h
   branches/gnome-2-24/embed/xulrunner/src/gecko-dom-event-private.h
   branches/gnome-2-24/embed/xulrunner/src/gecko-dom-event.cpp
   branches/gnome-2-24/embed/xulrunner/src/gecko-dom-event.h
   branches/gnome-2-24/embed/xulrunner/src/gecko-embed-marshal.list
   branches/gnome-2-24/embed/xulrunner/src/gecko-embed-private.h
   branches/gnome-2-24/embed/xulrunner/src/gecko-embed-signals.h
   branches/gnome-2-24/embed/xulrunner/src/gecko-embed-single-private.h
   branches/gnome-2-24/embed/xulrunner/src/gecko-embed-single.cpp
   branches/gnome-2-24/embed/xulrunner/src/gecko-embed-single.h
   branches/gnome-2-24/embed/xulrunner/src/gecko-embed-types.h
   branches/gnome-2-24/embed/xulrunner/src/gecko-embed.cpp
   branches/gnome-2-24/embed/xulrunner/src/gecko-embed.h
   branches/gnome-2-24/embed/xulrunner/src/gecko-init-internal.h
   branches/gnome-2-24/embed/xulrunner/src/gecko-init-private.h
   branches/gnome-2-24/embed/xulrunner/src/gecko-init.cpp
   branches/gnome-2-24/embed/xulrunner/src/gecko-init.h
   branches/gnome-2-24/embed/xulrunner/tests/Makefile.am
   branches/gnome-2-24/embed/xulrunner/tests/TestGtkEmbedNotebook.cpp
   branches/gnome-2-24/embed/xulrunner/tests/testgeckoembed.cpp
   branches/gnome-2-24/embed/xulrunner/utils/AutoJSContextStack.cpp
   branches/gnome-2-24/embed/xulrunner/utils/AutoJSContextStack.h
   branches/gnome-2-24/embed/xulrunner/utils/AutoWindowModalState.cpp
   branches/gnome-2-24/embed/xulrunner/utils/AutoWindowModalState.h
   branches/gnome-2-24/embed/xulrunner/utils/EphyBadCertRejector.cpp
   branches/gnome-2-24/embed/xulrunner/utils/EphyBadCertRejector.h
   branches/gnome-2-24/embed/xulrunner/utils/EphyUtils.cpp
   branches/gnome-2-24/embed/xulrunner/utils/EphyUtils.h
   branches/gnome-2-24/embed/xulrunner/utils/GeckoUtils.cpp
   branches/gnome-2-24/embed/xulrunner/utils/GeckoUtils.h
   branches/gnome-2-24/embed/xulrunner/utils/Makefile.am
   branches/gnome-2-24/embed/xulrunner/utils/ggeAutoModalDialog.cpp
   branches/gnome-2-24/embed/xulrunner/utils/ggeAutoModalDialog.h
   branches/gnome-2-24/embed/xulrunner/utils/ggeAutoSurvivalArea.cpp
   branches/gnome-2-24/embed/xulrunner/utils/ggeAutoSurvivalArea.h
   branches/gnome-2-24/m4/libxul.m4
   branches/gnome-2-24/xulapp/Makefile.am
   branches/gnome-2-24/xulapp/application.ini.in
Modified:
   branches/gnome-2-24/Makefile.am
   branches/gnome-2-24/configure.ac
   branches/gnome-2-24/doc/reference/Makefile.am
   branches/gnome-2-24/doc/reference/tmpl/ephy-embed.sgml
   branches/gnome-2-24/embed/Makefile.am
   branches/gnome-2-24/embed/ephy-embed-factory.c
   branches/gnome-2-24/m4/gecko.m4
   branches/gnome-2-24/src/Makefile.am

Modified: branches/gnome-2-24/Makefile.am
==============================================================================
--- branches/gnome-2-24/Makefile.am	(original)
+++ branches/gnome-2-24/Makefile.am	Mon Jan 12 19:22:58 2009
@@ -1,9 +1,5 @@
 SUBDIRS = lib embed src plugins data po help doc
 
-#if WITH_XULRUNNER_ENGINE
-#SUBDIRS += xulapp
-#endif
-
 ACLOCAL_AMFLAGS = -I m4
 
 NULL =

Modified: branches/gnome-2-24/configure.ac
==============================================================================
--- branches/gnome-2-24/configure.ac	(original)
+++ branches/gnome-2-24/configure.ac	Mon Jan 12 19:22:58 2009
@@ -213,30 +213,12 @@
 	AC_LANG_POP([C])
 fi
 
-# ************
-# Engine check
-# ************
-
-AC_MSG_CHECKING(for which engine to use)
-
-AC_ARG_WITH([engine],
-	AS_HELP_STRING([--with-engine@<:@=mozilla|webkit|xulrunner@:>@],
-		[Which engine to build against @<:@mozilla@:>@]),
-	[],[with_engine="mozilla"])
-
-AC_MSG_RESULT($with_engine)
-AC_SUBST([with_engine])
-
 # *******
 # Mozilla
 # *******
 
-if test "$with_engine" = "mozilla"; then
-
 GECKO_INIT([GECKO])
 
-AC_DEFINE([WITH_GECKO_ENGINE],[1],[Define if you wish to enable mozilla engine])
-
 AC_SUBST([GECKO])
 AC_SUBST([GECKO_FLAVOUR])
 AC_SUBST([GECKO_INCLUDE_ROOT])
@@ -417,50 +399,12 @@
 #GECKO_CHECK_CONTRACTIDS([$REQUIRED_CONTRACTS],
 #	[],[AC_MSG_ERROR([$gecko_cv_gecko needs to be compiled with at least --enable-extensions=default,$REQUIRED_EXTENSIONS])])
 
-fi # with_engine = mozilla
-
 GECKO_DEFINES
-AM_CONDITIONAL([WITH_GECKO_ENGINE], [test "$with_engine" = "mozilla"])
 AM_CONDITIONAL([HAVE_XULRUNNER],[test "$gecko_cv_gecko" = "xulrunner" -o "$gecko_cv_gecko" = "libxul" -o "$gecko_cv_gecko" = "libxul-embedding"])
 AM_CONDITIONAL([HAVE_MOZILLA_PSM],[test "$enable_psm" = "yes" -a "$have_psm" = "yes"])
 AM_CONDITIONAL([ENABLE_FILEPICKER],[test "$enable_filepicker" = "yes"])
 AM_CONDITIONAL([HAVE_NSIBADCERTLISTENER_H],[test "$have_nsibadcertlistener" = "yes"])
 
-# *********
-# Xulrunner
-# *********
-
-# This is the mozilla backend for xulrunner 1.9
-
-if test "$with_engine" = "xulrunner"; then
-
-LIBXUL_INIT
-
-AC_DEFINE([WITH_XULRUNNER_ENGINE],[1],[Define if building the Xulrunner backend])
-
-WEASEL_UA_VERSION=3.0
-AC_SUBST([WEASEL_UA_VERSION])
-
-
-fi
-
-LIBXUL_DEFINES
-
-AM_CONDITIONAL([WITH_XULRUNNER_ENGINE],[test "$with_engine" = "xulrunner"])
-
-# ******
-# WebKit
-# ******
-
-if test "$with_engine" = "webkit" ; then
-   AC_DEFINE([WITH_WEBKIT_ENGINE],[1],[Define if you wish to enable webkit engine])
-   PKG_CHECK_MODULES([WEBKIT], [webkit-1.0])
-   AC_SUBST([WEBKIT_CFLAGS])
-   AC_SUBST([WEBKIT_LIBS])
-fi # with_engine = webkit
-
-AM_CONDITIONAL([WITH_WEBKIT_ENGINE], test "$with_engine" = "webkit")
-
 # ***************
 # Multimedia keys
 # ***************
@@ -577,8 +521,6 @@
 # Gecko 1.9 can handle .desktop files from file: URLs itself, but we
 # also support windows .lnk files, so always enable this plugin
 
-if test "$with_engine" = "mozilla" ; then
-
 AC_MSG_CHECKING([whether to build the deskop file plugin])
 AC_ARG_ENABLE([desktop-file-plugin],
 	AS_HELP_STRING([--disable-desktop-file-plugin],[Disable the desktop file plugin (default: enabled)]),
@@ -599,10 +541,6 @@
 	AC_DEFINE([HAVE_PRIVATE_PLUGINS],[1],[Define if any private plugins are enabled])
 fi
 
-else # with_engine = mozilla
-        enable_desktop_file_plugin=no
-fi   # with_engine != mozilla
-
 AM_CONDITIONAL([ENABLE_DESKTOP_FILE_PLUGIN],[test "$enable_desktop_file_plugin" = "yes"])
 
 # *******************
@@ -668,8 +606,6 @@
 # Enchant spell checking
 # Does not appear to work on gecko 1.8.0, so only offer for >= 1.8.1
 
-if test "$with_engine" = "mozilla" ; then
-
 if test "$gecko_cv_gecko_version_int" -ge "1008001"; then
 
 # Default to 'disabled' until it's fully functional
@@ -697,11 +633,6 @@
 	AC_DEFINE([ENABLE_SPELLCHECKER],[1],[Define to enable the spell checker])
 fi
 
-else # with_engine = mozilla
-        enable_spell_checker=no
-fi   # with_engine != mozilla
-
-
 AM_CONDITIONAL([ENABLE_SPELLCHECKER],[test "$enable_spell_checker" = "yes" -a "$have_gecko_spell_checker" = "yes"])
 
 # ************
@@ -820,7 +751,6 @@
 lib/widgets/Makefile
 embed/Makefile
 embed/mozilla/Makefile
-embed/webkit/Makefile
 src/Makefile
 src/bookmarks/Makefile
 src/ephy-version.h
@@ -851,11 +781,6 @@
  	Desktop file plugin        : $enable_desktop_file_plugin
  	Spellchecker               : $enable_spell_checker (experimental)
  
-        Engine                     : $with_engine
- "
-
-if test "$with_engine" = "mozilla"; then
-echo "        Gecko backend              : $gecko_cv_gecko version $gecko_cv_gecko_version
+	Gecko backend              : $gecko_cv_gecko version $gecko_cv_gecko_version
 	PSM support                : $enable_psm
 "
-fi

Modified: branches/gnome-2-24/doc/reference/Makefile.am
==============================================================================
--- branches/gnome-2-24/doc/reference/Makefile.am	(original)
+++ branches/gnome-2-24/doc/reference/Makefile.am	Mon Jan 12 19:22:58 2009
@@ -80,9 +80,6 @@
 	mozilla-notifiers.h \
 	MozillaPrivate.h \
 	MozRegisterComponents.h \
-	webkit-embed.h \
-	webkit-embed-persist.h \
-	webkit-embed-single.h \
 	PrintingPromptService.h \
 	egg-editable-toolbar.h \
 	eggintl.h \
@@ -152,30 +149,17 @@
 		$(DBUS_CFLAGS) \
 		$(INCINTL)
 
-if WITH_GECKO_ENGINE
 GTKDOC_CFLAGS += -I$(top_srcdir)/embed/mozilla \
 		 -I$(GECKO_INCLUDE_ROOT) \
 	         -I$(GECKO_INCLUDE_ROOT)/gtkembedmoz \
 		 $(GECKO_CFLAGS)
-endif
-
-if WITH_WEBKIT_ENGINE
-GTKDOC_CFLAGS += -I$(top_srcdir)/embed/webkit \
-		 $(WEBKIT_CFLAGS)
-endif
 
 GTKDOC_LIBS = \
 	$(top_builddir)/src/libephymain.la \
 	$(top_builddir)/src/bookmarks/libephybookmarks.la \
 	$(top_builddir)/embed/libephyembedfactory.la
 
-if WITH_GECKO_ENGINE
 GTKDOC_LIBS += $(top_builddir)/embed/mozilla/libephymozillaembed.la
-endif
-
-if WITH_WEBKIT_ENGINE
-GTKDOC_LIBS += $(top_builddir)/embed/webkit/libephywebkitembed.la
-endif
 
 GTKDOC_LIBS += \
 	$(top_builddir)/embed/libephyembed.la \

Modified: branches/gnome-2-24/doc/reference/tmpl/ephy-embed.sgml
==============================================================================
--- branches/gnome-2-24/doc/reference/tmpl/ephy-embed.sgml	(original)
+++ branches/gnome-2-24/doc/reference/tmpl/ephy-embed.sgml	Mon Jan 12 19:22:58 2009
@@ -257,7 +257,6 @@
 @: 
 @: 
 @: 
-@: 
 @:
 @Param2: 
 

Modified: branches/gnome-2-24/embed/Makefile.am
==============================================================================
--- branches/gnome-2-24/embed/Makefile.am	(original)
+++ branches/gnome-2-24/embed/Makefile.am	Mon Jan 12 19:22:58 2009
@@ -1,6 +1,4 @@
-SUBDIRS = $(with_engine)
-
-DIST_SUBDIRS = mozilla webkit
+SUBDIRS = mozilla
 
 NULL =
 
@@ -89,22 +87,10 @@
 	ephy-embed-factory.h
 
 libephyembedfactory_la_CPPFLAGS = \
-	-I$(top_srcdir)/embed/$(with_engine)		\
+	-I$(top_srcdir)/embed/mozilla	\
 	$(AM_CPPFLAGS)
 
-if WITH_XULRUNNER_ENGINE
-libephyembedfactory_la_CPPFLAGS += \
-	-I$(srcdir)/xulrunner/src		\
-	-I$(srcdir)/xulrunner/embed		\
-	-I$(top_builddir)/embed/xulrunner/src	\
-	-I$(top_builddir)/embed/xulrunner/embed	\
-	$(LIBXUL_INCLUDES)			\
-	$(NULL)
-endif
-
-if WITH_GECKO_ENGINE
 libephyembedfactory_la_CPPFLAGS += -I$(GECKO_INCLUDE_ROOT)/gtkembedmoz
-endif
 
 libephyembedfactory_la_CFLAGS = \
 	$(GECKO_CFLAGS) \

Modified: branches/gnome-2-24/embed/ephy-embed-factory.c
==============================================================================
--- branches/gnome-2-24/embed/ephy-embed-factory.c	(original)
+++ branches/gnome-2-24/embed/ephy-embed-factory.c	Mon Jan 12 19:22:58 2009
@@ -21,22 +21,10 @@
 #include "config.h"
 
 #include "ephy-embed-factory.h"
-#if defined(WITH_XULRUNNER_ENGINE)
 #include "mozilla-embed.h"
 #include "mozilla-embed-find.h"
 #include "mozilla-embed-persist.h"
 #include "mozilla-embed-single.h"
-#elif defined(WITH_GECKO_ENGINE)
-#include "mozilla-embed.h"
-#include "mozilla-embed-find.h"
-#include "mozilla-embed-persist.h"
-#include "mozilla-embed-single.h"
-#elif defined(WITH_WEBKIT_ENGINE)
-#include "webkit-embed.h"
-#include "webkit-embed-find.h"
-#include "webkit-embed-persist.h"
-#include "webkit-embed-single.h"
-#endif
 #include "ephy-embed.h"
 #include "ephy-embed-find.h"
 #include "ephy-embed-persist.h"
@@ -57,43 +45,19 @@
 
 	if (type == EPHY_TYPE_EMBED)
 	{
-#if defined(WITH_XULRUNNER_ENGINE)
 		object = g_object_new (MOZILLA_TYPE_EMBED, NULL);
-#elif defined(WITH_GECKO_ENGINE)
-		object = g_object_new (MOZILLA_TYPE_EMBED, NULL);
-#elif defined(WITH_WEBKIT_ENGINE)
-	object = g_object_new (WEBKIT_TYPE_EMBED, NULL);
-#endif
 	}
 	else if (type == EPHY_TYPE_EMBED_PERSIST)
 	{
-#if defined(WITH_XULRUNNER_ENGINE)
-		object = g_object_new (MOZILLA_TYPE_EMBED_PERSIST, NULL);
-#elif defined(WITH_GECKO_ENGINE)
 		object = g_object_new (MOZILLA_TYPE_EMBED_PERSIST, NULL);
-#elif defined(WITH_WEBKIT_ENGINE)
-	object = g_object_new (WEBKIT_TYPE_EMBED_PERSIST, NULL);
-#endif
 	}
 	else if (type == EPHY_TYPE_EMBED_FIND)
 	{
-#if defined(WITH_XULRUNNER_ENGINE)
 		object = g_object_new (MOZILLA_TYPE_EMBED_FIND, NULL);
-#elif defined(WITH_GECKO_ENGINE)
-		object = g_object_new (MOZILLA_TYPE_EMBED_FIND, NULL);
-#elif defined(WITH_WEBKIT_ENGINE)
-		object = g_object_new (WEBKIT_TYPE_EMBED_FIND, NULL);
-#endif
 	}
 	else if (type == EPHY_TYPE_EMBED_SINGLE)
 	{
-#if defined(WITH_XULRUNNER_ENGINE)
-		object = g_object_new (MOZILLA_TYPE_EMBED_SINGLE, NULL);
-#elif defined(WITH_GECKO_ENGINE)
 		object = g_object_new (MOZILLA_TYPE_EMBED_SINGLE, NULL);
-#elif defined(WITH_WEBKIT_ENGINE)
-		object = g_object_new (WEBKIT_TYPE_EMBED_SINGLE, NULL);
-#endif
 	}
 	else
 	{

Modified: branches/gnome-2-24/m4/gecko.m4
==============================================================================
--- branches/gnome-2-24/m4/gecko.m4	(original)
+++ branches/gnome-2-24/m4/gecko.m4	Mon Jan 12 19:22:58 2009
@@ -347,7 +347,7 @@
 fi
 
 if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
-	PKG_CHECK_EXISTS([${gecko_cv_gecko} >= 1.9.1],[gecko_cv_have_gecko_1_9_1=yes],[gecko_cv_have_gecko_1_9_1=no])
+	PKG_CHECK_EXISTS([${gecko_cv_gecko} >= 1.9.1],[gecko_cv_have_gecko_1_9_1=yes gecko_cv_gecko_version="1.9.1" gecko_cv_gecko_version_int=1009001],[gecko_cv_have_gecko_1_9_1=no])
 else
 	gecko_cv_have_gecko_1_9_1=no
 fi

Modified: branches/gnome-2-24/src/Makefile.am
==============================================================================
--- branches/gnome-2-24/src/Makefile.am	(original)
+++ branches/gnome-2-24/src/Makefile.am	Mon Jan 12 19:22:58 2009
@@ -147,14 +147,14 @@
 	-I$(top_srcdir)/lib/widgets	\
 	-I$(top_srcdir)/lib/egg		\
 	-I$(top_srcdir)/embed		\
-	-I$(top_srcdir)/embed/$(with_engine)	\
+	-I$(top_srcdir)/embed/mozilla	\
 	-I$(top_srcdir)/src		\
 	-I$(top_srcdir)/src/bookmarks	\
 	-I$(top_builddir)/lib		\
 	-I$(top_builddir)/lib/widgets	\
 	-I$(top_builddir)/lib/egg	\
 	-I$(top_builddir)/embed		\
-	-I$(top_builddir)/embed/$(with_engine)	\
+	-I$(top_builddir)/embed/mozilla	\
 	-I$(top_builddir)/src		\
 	-I$(top_builddir)/src/bookmarks	\
 	$(PYTHON_INCLUDES)		\
@@ -215,24 +215,9 @@
 	$(top_builddir)/src/bookmarks/libephybookmarks.la \
 	$(top_builddir)/embed/libephyembedfactory.la
 
-if WITH_XULRUNNER_ENGINE
-epiphany_LDADD += \
-	$(top_builddir)/embed/xulrunner/utils/libephyxulrunnerutils.la	\
-	$(top_builddir)/embed/xulrunner/src/libgnomegeckoembed.la	\
-	$(top_builddir)/embed/xulrunner/embed/libephyxulrunnerembed.la	\
-	$(top_builddir)/embed/xulrunner/components/libephycomponents.la
-endif
-
-if WITH_GECKO_ENGINE
 epiphany_LDADD += \
 	$(GECKO_LIBS) \
 	$(top_builddir)/embed/mozilla/libephymozillaembed.la
-endif
-
-if WITH_WEBKIT_ENGINE
-epiphany_LDADD += \
-	$(top_builddir)/embed/webkit/libephywebkitembed.la
-endif
 
 epiphany_LDADD += \
 	$(top_builddir)/embed/libephyembed.la \
@@ -240,12 +225,6 @@
 	$(top_builddir)/lib/libephymisc.la \
 	$(top_builddir)/lib/egg/libegg.la
 
-if WITH_XULRUNNER_ENGINE
-epiphany_LDFLAGS += -R$(LIBXUL_LIBDIR)
-epiphany_LDADD += $(LIBXUL_LIBS) -lxpcomglue
-endif
-
-if WITH_GECKO_ENGINE
 if !HAVE_GECKO_XPCOM_GLUE
 epiphany_LDFLAGS += -R$(GECKO_HOME)
 endif
@@ -254,12 +233,6 @@
 	$(GECKO_LIBS) \
 	$(GECKO_EXTRA_LIBS) \
 	$(GECKO_GLUE_LIBS)
-endif
-
-if WITH_WEBKIT_ENGINE
-epiphany_LDADD += \
-	$(WEBKIT_LIBS)
-endif
 
 epiphany_LDADD += \
 	$(GECKO_LIBS) \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]