epiphany r8183 - in trunk: . data data/chrome doc/reference embed m4 src

[chpe svn gnome org]

Author: chpe
Date: Thu Apr  3 22:00:23 2008
New Revision: 8183
URL: http://svn.gnome.org/viewvc/epiphany?rev=8183&view=rev

Log:
Exorcise gecko configure & build stuff

Removed:
   trunk/data/chrome/
   trunk/data/default-prefs-common.js
   trunk/data/weasel-ua-pref.js.in
   trunk/m4/gecko.m4
   trunk/m4/libxul.m4
Modified:
   trunk/Makefile.am
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/doc/reference/Makefile.am
   trunk/embed/Makefile.am
   trunk/embed/ephy-embed-factory.c
   trunk/src/Makefile.am
   trunk/src/epiphany.defs
   trunk/src/epiphany.override

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Apr  3 22:00:23 2008
@@ -1,8 +1,4 @@
-SUBDIRS = lib embed src plugins data po help doc
-
-#if WITH_XULRUNNER_ENGINE
-#SUBDIRS += xulapp
-#endif
+SUBDIRS = lib embed src data po help doc
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -38,8 +34,7 @@
 	--enable-desktop-file-plugin	\
 	--enable-gtk-doc		\
 	--disable-schemas-install	\
-	--disable-scrollkeeper		\
-	--with-gecko=$(GECKO)
+	--disable-scrollkeeper
 
 # Ignore gtk theme cache files on distcheck
 distuninstallcheck_listfiles = find . -type f -print | grep -v 'icon-theme.cache'

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Apr  3 22:00:23 2008
@@ -196,231 +196,13 @@
 	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])
-AC_SUBST([GECKO_HOME])
-AC_SUBST([GECKO_PREFIX])
-AC_SUBST([GECKO_EXTRA_LIBS])
-AC_SUBST([GECKO_GLUE_LIBS])
-
-if test "$gecko_cv_gecko_version_int" -lt "1008000"; then
-	AC_MSG_ERROR([Gecko version $gecko_cv_gecko_version is not supported!])
-fi
-
-if test "$gecko_cv_gecko_flavour" != "toolkit"; then
-	AC_MSG_ERROR(["$gecko_cv_gecko_flavour" flavoured geckos aren't tasty enough!])
-fi
-
-case "$gecko_cv_gecko" in
-xulrunner) min_version=1.8 ;;
-libxul*) min_version=1.9 ;;
-*firefox) min_version=1.5 ;;
-*) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
-esac
-
-# Added $gecko_cv_gecko-js for debian xulrunner brokenness
-if test $gecko_cv_gecko != "libxul-embedding" -a $gecko_cv_gecko != "libxul"; then
-	# debian xulrunner lacks -xpcom -> -js depends
-	if pkg-config --exists ${gecko_cv_gecko}-js; then
-		gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-js"
-	fi
-	GECKO_CFLAGS=`pkg-config --cflags ${gecko_cv_gecko}-xpcom '>=' $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies`
-	GECKO_LIBS=`pkg-config --libs ${gecko_cv_gecko}-xpcom '>=' $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies`
-
-#	PKG_CHECK_MODULES([GECKO],[ ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies])
-else
-	GECKO_CFLAGS="$GECKO_CFLAGS"
-	GECKO_LIBS="$GECKO_LIBS `pkg-config --libs ${gecko_cv_gecko}`"
-fi
-
-AC_MSG_CHECKING(nspr in gecko)
-if test "$GECKO_NSPR" != yes; then
-	AC_MSG_RESULT(no)
-	AC_MSG_CHECKING(nspr in system)
-	gecko_nspr=
-	if $PKG_CONFIG --exists mozilla-nspr; then
-		gecko_nspr=mozilla-nspr
-	elif $PKG_CONFIG --exists ${gecko_cv_gecko}-nspr; then
-		gecko_nspr=${gecko_cv_gecko}-nspr
-	fi
-	if $PKG_CONFIG --exists nspr; then
-		gecko_nspr=nspr
-	fi
-	if test -z "$gecko_nspr"; then
-		AC_MSG_ERROR([no nspr available])
-	fi
-
-	GECKO_CFLAGS="$GECKO_CFLAGS `$PKG_CONFIG --cflags ${gecko_nspr}`"
-	GECKO_LIBS="$GECKO_LIBS `$PKG_CONFIG --libs ${gecko_nspr}`"
-	_GECKO_CFLAGS="$GECKO_CFLAGS"
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(yes)
-fi
-
-AC_SUBST([GECKO_CFLAGS])
-AC_SUBST([GECKO_LIBS])
-
-# *****************
-# Weasel UA version
-# *****************
-
-# FIXMEchpe: find a way to always automatically use the latest weasel minor version!
-
-if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
-  WEASEL_UA_VERSION="3.0"
-elif test "$gecko_cv_gecko_version_int" -ge "1008001"; then
-  WEASEL_UA_VERSION="2.0.0.4"
-else
-  WEASEL_UA_VERSION="1.5.0.12"
-fi
-
-AC_SUBST([WEASEL_UA_VERSION])
-
-# **********************************
-# now tests for mozilla API variance
-# **********************************
-
-# First build a test program to see whether compiling and running XPCOM
-# programs works at all, so we don't get false test failures below
-
-GECKO_XPCOM_PROGRAM_CHECK
-
-# Check for PSM header(s) to infer PSM presence
-
-GECKO_CHECK_HEADERS([pipnss],[nsIX509Cert.h],[have_psm=yes],[have_psm=no])
-
-# Make sure we don't accidentally build without PSM support
-
-AC_MSG_CHECKING([whether to include PSM support])
-AC_ARG_ENABLE([psm],
-	AS_HELP_STRING([--disable-psm],[Disable PSM support (default: enabled)]),
-	[],[enable_psm=yes])
-AC_MSG_RESULT([$enable_psm])
-
-if test "$enable_psm" = "yes" -a "$have_psm" = "no"; then
-	AC_MSG_ERROR([PSM headers not found; use --disable-psm to disable building with PSM support])
-elif test "$have_psm" = "no"; then
-	AC_MSG_WARN([PSM headers not found; PSM support disabled])
-fi
-
-if test "$enable_psm" = "yes" -a "$have_psm" = "yes"; then
-	AC_DEFINE([HAVE_MOZILLA_PSM],[1],[Define if you have the mozilla NSS headers installed]) 
-fi
-
-# Check whether to enable our filepicker component
-
-AC_MSG_CHECKING([whether to enable native gtk+ filepicker])
-AC_ARG_ENABLE([filepicker],
-	AS_HELP_STRING([--enable-filepicker],[Whether to enable the gtk+ native filepicker; not needed when the mozilla build itself has native gtk+ filepicker enabled (default:enabled)]),
-	[],[enable_filepicker=yes])
-AC_MSG_RESULT([$enable_filepicker])
-
-if test "$enable_filepicker" = "yes"; then
-	AC_DEFINE([ENABLE_FILEPICKER],[1],[Define to enable the native filepicker])
-fi
-
-# Check for nsINonBlockingAlertService
-# Added in 1.8.1 and 1.9
-
-GECKO_CHECK_HEADERS([windowwatcher],[nsINonBlockingAlertService.h])
-
-# Check for nsIGlobalHistory3
-# Added in 1.8.1 and 1.9
-
-GECKO_CHECK_HEADERS([docshell],[nsIGlobalHistory3.h])
-
-# Check for nsIIOService2.h
-# Added in 1.9
-
-GECKO_CHECK_HEADERS([necko],[nsIIOService2.h])
-
-# Check for nsIMutableArray.h
-# Split out into its own header in 1.9
-
-GECKO_CHECK_HEADERS([xpcom],[nsIMutableArray.h])
-
-# Check for spell check extension
-
-GECKO_CHECK_HEADERS([spellchecker],[mozISpellCheckingEngine.h],
-	[have_gecko_spell_checker=yes],[have_gecko_spell_checker=no])
-
-# Check for some contractIDs that we need but are provided by extensions
-# which may or may not have been built.
-
-#REQUIRED_CONTRACTS="@mozilla.org/permissionmanager;1 @mozilla.org/PopupWindowManager;1 @mozilla.org/cookie/permission;1 @mozilla.org/permissions/contentblocker;1"
-#REQUIRED_EXTENSIONS="cookie,permissions"
-#
-#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"])
-AM_CONDITIONAL([HAVE_MOZILLA_PSM],[test "$enable_psm" = "yes" -a "$have_psm" = "yes"])
-AM_CONDITIONAL([ENABLE_FILEPICKER],[test "$enable_filepicker" = "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")
+PKG_CHECK_MODULES([WEBKIT], [webkit-1.0])
+AC_SUBST([WEBKIT_CFLAGS])
+AC_SUBST([WEBKIT_LIBS])
 
 # ***************
 # Multimedia keys
@@ -563,33 +345,33 @@
 # 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)]),
-	[],[enable_desktop_file_plugin=yes])
-AC_MSG_RESULT([$enable_desktop_file_plugin])
-
-if test "$enable_desktop_file_plugin" = "yes"; then
-	if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
-		PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0])
-	else
-		PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0])
-	fi
-	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS])
-	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS])
-fi
-
-if test "$enable_desktop_file_plugin" = "yes"; then
-	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"])
+# 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)]),
+# 	[],[enable_desktop_file_plugin=yes])
+# AC_MSG_RESULT([$enable_desktop_file_plugin])
+# 
+# if test "$enable_desktop_file_plugin" = "yes"; then
+# 	if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+# 		PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0])
+# 	else
+# 		PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0])
+# 	fi
+# 	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS])
+# 	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS])
+# fi
+# 
+# if test "$enable_desktop_file_plugin" = "yes"; then
+# 	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"])
 
 # *******************
 # Additional features
@@ -651,45 +433,6 @@
 
 AM_CONDITIONAL([ENABLE_NETWORK_MANAGER],[test "$enable_network_manager" = "yes"])
 
-# 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
-AC_MSG_CHECKING([whether spell checking support is requested])
-AC_ARG_ENABLE([spell-checker],
-	AS_HELP_STRING([--enable-spell-checker],[Whether to enable spell checking using enchant]),
-	[],[enable_spell_checker=no])
-AC_MSG_RESULT([$enable_spell_checker])
-else # gecko >= 1.8.1
-        enable_spell_checker=no
-fi   # gecko < 1.8.1
-
-if test "$enable_spell_checker" = "yes" -a "$have_gecko_spell_checker" != "yes"; then
-	AC_MSG_ERROR([Spell check support requested but $gecko_cv_gecko was not compiled with 'spellchecker' extension enabled.])
-fi
-
-if test "$enable_spell_checker" = "yes" -a "$have_gecko_spell_checker" = "yes"; then
-	# FIXME check which version we really need
-	ENCHANT_REQUIRED=1.0
-
-	PKG_CHECK_MODULES([SPELLCHECKER],[enchant >= $ENCHANT_REQUIRED])
-	AC_SUBST([SPELLCHECKER_CFLAGS])
-	AC_SUBST([SPELLCHECKER_LIBS])
-
-	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"])
-
 # ************
 # Misc defines
 # ************
@@ -745,6 +488,8 @@
 # uninstalled share dir to search data
 AC_DEFINE_UNQUOTED([SHARE_UNINSTALLED_DIR], ["`pwd`/data"], [path to source data dir])
 
+AM_CONDITIONAL([ENABLE_SPELLCHECKER],[false])
+
 # ****************
 # Distributor name
 # ****************
@@ -791,33 +536,29 @@
 data/epiphany-${EPIPHANY_API_VERSION}.pc:data/epiphany.pc.in
 data/epiphany.desktop.in
 data/bme.desktop.in
-data/chrome/Makefile
-data/chrome/brand.dtd
-data/chrome/brand.properties
 data/glade/Makefile
 data/icons/Makefile
 data/art/Makefile
 data/ui/Makefile
-data/weasel-ua-pref.js
 doc/Makefile
 doc/reference/Makefile
 lib/Makefile
 lib/egg/Makefile
 lib/widgets/Makefile
 embed/Makefile
-embed/mozilla/Makefile
 embed/webkit/Makefile
 src/Makefile
 src/bookmarks/Makefile
 src/ephy-version.h
 help/Makefile
-plugins/Makefile
-plugins/desktop-file/Makefile
 po/Makefile.in
 ],
 [],
 [EPIPHANY_API_VERSION=$EPIPHANY_API_VERSION])
 
+# plugins/Makefile
+# plugins/desktop-file/Makefile
+
 AC_OUTPUT
 
 # *************************************
@@ -834,14 +575,4 @@
  	Zeroconf bookmarks support : $enable_zeroconf
  	NetworkManager support     : $enable_network_manager
  	Python support             : $enable_python
- 	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
-	PSM support                : $enable_psm
 "
-fi

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Thu Apr  3 22:00:23 2008
@@ -1,27 +1,11 @@
-SUBDIRS = art chrome glade icons ui
+
+SUBDIRS = art glade icons ui
 
 @INTLTOOL_SERVER_RULE@
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_SCHEMAS_RULE@
 @INTLTOOL_XML_RULE@
 
-default_prefs_in_FILES = \
-	default-prefs-common.js
-
-default_prefs_files = \
-	default-prefs-common.js
-
-
-if HAVE_XULRUNNER
-default_prefs_files += weasel-ua-pref.js
-endif
-
-default-prefs.js: $(default_prefs_files)
-	cat $^ > $@
-
-default_prefsdir = $(pkgdatadir)
-default_prefs_DATA = default-prefs.js
-
 desktop_in_files = epiphany.desktop.in.in bme.desktop.in.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
@@ -79,7 +63,6 @@
 	$(about_DATA)			\
 	$(mimepermission_DATA)		\
 	$(pkgconfig_DATA)		\
-	$(default_prefs_in_FILES)	\
 	$(xsl_DATA)			\
 	$(service_DATA)			\
 	$(m4data_DATA)			\
@@ -91,5 +74,4 @@
 	$(service_DATA)		\
 	$(schema_in_files:.schemas.in=.schemas)	\
 	$(pkgconfig_DATA)	\
-	$(default_prefs_DATA)	\
 	$(desktop_DATA)

Modified: trunk/doc/reference/Makefile.am
==============================================================================
--- trunk/doc/reference/Makefile.am	(original)
+++ trunk/doc/reference/Makefile.am	Thu Apr  3 22:00:23 2008
@@ -148,44 +148,22 @@
 		-I$(top_srcdir)/src/bookmarks \
 		-I$(top_srcdir)/lib/egg \
 		-I$(top_builddir)/lib/egg \
+		-I$(top_srcdir)/embed/webkit \
 		$(DEPENDENCIES_CFLAGS) \
+		$(WEBKIT_CFLAGS) \
 		$(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/libephyembedfactory.la \
+	$(top_builddir)/embed/webkit/libephywebkitembed.la \
 	$(top_builddir)/embed/libephyembed.la \
 	$(top_builddir)/lib/widgets/libephywidgets.la \
 	$(top_builddir)/lib/libephymisc.la \
 	$(top_builddir)/lib/egg/libegg.la \
         $(DEPENDENCIES_LIBS) \
-	$(GECKO_LIBS)	\
-	$(GECKO_EXTRA_LIBS) \
-	$(GECKO_GLUE_LIBS) \
 	$(DBUS_LIBS) \
 	$(LIBINTL)
 
@@ -251,7 +229,7 @@
 	@echo '*** Scanning header files ***'
 	@-chmod -R u+w $(srcdir)
 	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
-	    LD_LIBRARY_PATH=$(GECKO_HOME):$$LD_LIBRARY_PATH CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
 	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \

Modified: trunk/embed/Makefile.am
==============================================================================
--- trunk/embed/Makefile.am	(original)
+++ trunk/embed/Makefile.am	Thu Apr  3 22:00:23 2008
@@ -1,6 +1,4 @@
-SUBDIRS = $(with_engine)
-
-DIST_SUBDIRS = xulrunner mozilla webkit
+SUBDIRS = webkit
 
 NULL =
 
@@ -89,23 +87,9 @@
 	ephy-embed-factory.h
 
 libephyembedfactory_la_CPPFLAGS = \
-	-I$(top_srcdir)/embed/$(with_engine)		\
+	-I$(top_srcdir)/embed/webkit	\
 	$(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) \
 	$(DEPENDENCIES_CFLAGS) 	\

Modified: trunk/embed/ephy-embed-factory.c
==============================================================================
--- trunk/embed/ephy-embed-factory.c	(original)
+++ trunk/embed/ephy-embed-factory.c	Thu Apr  3 22:00:23 2008
@@ -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
+                object = g_object_new (WEBKIT_TYPE_EMBED, NULL);
 	}
 	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
+                object = g_object_new (WEBKIT_TYPE_EMBED_PERSIST, NULL);
 	}
 	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: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Apr  3 22:00:23 2008
@@ -181,15 +181,6 @@
 endif
 
 
-# we do this to force c++ linkage if we are using the glue and 
-# are running gecko 1.9 because standalone glue embedders that use
-# gtk_moz_embed_* need to #include <gtkmozembed_glue.cpp>
-if HAVE_GECKO_1_9
-if HAVE_GECKO_XPCOM_GLUE
-nodist_EXTRA_epiphany_SOURCES = dummy.cpp
-endif
-endif
-
 epiphany_SOURCES = ephy-main.c
 
 epiphany_CPPFLAGS = \
@@ -213,57 +204,14 @@
 epiphany_LDADD = \
 	libephymain.la \
 	$(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/libephyembedfactory.la \
+	$(top_builddir)/embed/webkit/libephywebkitembed.la \
 	$(top_builddir)/embed/libephyembed.la \
 	$(top_builddir)/lib/widgets/libephywidgets.la \
 	$(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
-
-epiphany_LDADD += \
-	$(GECKO_LIBS) \
-	$(GECKO_EXTRA_LIBS) \
-	$(GECKO_GLUE_LIBS)
-endif
-
-if WITH_WEBKIT_ENGINE
-epiphany_LDADD += \
-	$(WEBKIT_LIBS)
-endif
-
-epiphany_LDADD += \
-	$(GECKO_LIBS) \
+	$(top_builddir)/lib/egg/libegg.la \
 	$(DEPENDENCIES_LIBS) \
+	$(WEBKIT_LIBS) \
 	$(DBUS_LIBS) \
 	$(LIBINTL)
 

Modified: trunk/src/epiphany.defs
==============================================================================
--- trunk/src/epiphany.defs	(original)
+++ trunk/src/epiphany.defs	Thu Apr  3 22:00:23 2008
@@ -152,11 +152,11 @@
   (gtype-id "EPHY_TYPE_PASSWORD_MANAGER")
 )
 
-(define-interface PermissionManager
-  (in-module "Ephy")
-  (c-name "EphyPermissionManager")
-  (gtype-id "EPHY_TYPE_PERMISSION_MANAGER")
-)
+;; (define-interface PermissionManager
+;;   (in-module "Ephy")
+;;   (c-name "EphyPermissionManager")
+;;   (gtype-id "EPHY_TYPE_PERMISSION_MANAGER")
+;; )
 
 (define-object SearchEntry
   (in-module "Ephy")
@@ -329,16 +329,16 @@
   )
 )
 
-(define-enum Permission
-  (in-module "Ephy")
-  (c-name "EphyPermission")
-  (gtype-id "EPHY_TYPE_PERMISSION")
-  (values
-    '("allowed" "EPHY_PERMISSION_ALLOWED")
-    '("denied" "EPHY_PERMISSION_DENIED")
-    '("default" "EPHY_PERMISSION_DEFAULT")
-  )
-)
+;; (define-enum Permission
+;;   (in-module "Ephy")
+;;   (c-name "EphyPermission")
+;;   (gtype-id "EPHY_TYPE_PERMISSION")
+;;   (values
+;;     '("allowed" "EPHY_PERMISSION_ALLOWED")
+;;     '("denied" "EPHY_PERMISSION_DENIED")
+;;     '("default" "EPHY_PERMISSION_DEFAULT")
+;;   )
+;; )
 
 (define-flags TbModelFlags
   (in-module "Egg")
@@ -965,10 +965,10 @@
   (return-type "GType")
 )
 
-(define-function ephy_permission_get_type
-  (c-name "ephy_permission_get_type")
-  (return-type "GType")
-)
+;; (define-function ephy_permission_get_type
+;;   (c-name "ephy_permission_get_type")
+;;   (return-type "GType")
+;; )
 
 
 
@@ -1563,90 +1563,90 @@
 
 ;; From ../../embed/ephy-permission-manager.h
 
-(define-function ephy_permission_get_type
-  (c-name "ephy_permission_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_permission_info_get_type
-  (c-name "ephy_permission_info_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_permission_info_new
-  (c-name "ephy_permission_info_new")
-  (is-constructor-of "EphyPermissionInfo")
-  (return-type "EphyPermissionInfo*")
-  (parameters
-    '("const-char*" "host")
-    '("const-char*" "type")
-    '("EphyPermission" "permission")
-  )
-)
-
-(define-method copy
-  (of-object "EphyPermissionInfo")
-  (c-name "ephy_permission_info_copy")
-  (return-type "EphyPermissionInfo*")
-)
-
-(define-method free
-  (of-object "EphyPermissionInfo")
-  (c-name "ephy_permission_info_free")
-  (return-type "none")
-)
-
-(define-function ephy_permission_manager_get_type
-  (c-name "ephy_permission_manager_get_type")
-  (return-type "GType")
-)
-
-(define-method add_permission
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_add_permission")
-  (return-type "none")
-  (parameters
-    '("const-char*" "host")
-    '("const-char*" "type")
-    '("EphyPermission" "permission")
-  )
-)
-
-(define-method remove_permission
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_remove_permission")
-  (return-type "none")
-  (parameters
-    '("const-char*" "host")
-    '("const-char*" "type")
-  )
-)
-
-(define-method clear_permissions
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_clear_permissions")
-  (return-type "none")
-)
-
-(define-method test_permission
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_test_permission")
-  (return-type "EphyPermission")
-  (parameters
-    '("const-char*" "host")
-    '("const-char*" "type")
-  )
-)
-
-(define-method list_permissions
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_list_permissions")
-  (return-type "GList*")
-  (parameters
-    '("const-char*" "type")
-  )
-)
-
+;; (define-function ephy_permission_get_type
+;;   (c-name "ephy_permission_get_type")
+;;   (return-type "GType")
+;; )
+;; 
+;; (define-function ephy_permission_info_get_type
+;;   (c-name "ephy_permission_info_get_type")
+;;   (return-type "GType")
+;; )
+;; 
+;; (define-function ephy_permission_info_new
+;;   (c-name "ephy_permission_info_new")
+;;   (is-constructor-of "EphyPermissionInfo")
+;;   (return-type "EphyPermissionInfo*")
+;;   (parameters
+;;     '("const-char*" "host")
+;;     '("const-char*" "type")
+;;     '("EphyPermission" "permission")
+;;   )
+;; )
+;; 
+;; (define-method copy
+;;   (of-object "EphyPermissionInfo")
+;;   (c-name "ephy_permission_info_copy")
+;;   (return-type "EphyPermissionInfo*")
+;; )
+;; 
+;; (define-method free
+;;   (of-object "EphyPermissionInfo")
+;;   (c-name "ephy_permission_info_free")
+;;   (return-type "none")
+;; )
+;; 
+;; (define-function ephy_permission_manager_get_type
+;;   (c-name "ephy_permission_manager_get_type")
+;;   (return-type "GType")
+;; )
+;; 
+;; (define-method add_permission
+;;   (of-object "EphyPermissionManager")
+;;   (c-name "ephy_permission_manager_add_permission")
+;;   (return-type "none")
+;;   (parameters
+;;     '("const-char*" "host")
+;;     '("const-char*" "type")
+;;     '("EphyPermission" "permission")
+;;   )
+;; )
+;; 
+;; (define-method remove_permission
+;;   (of-object "EphyPermissionManager")
+;;   (c-name "ephy_permission_manager_remove_permission")
+;;   (return-type "none")
+;;   (parameters
+;;     '("const-char*" "host")
+;;     '("const-char*" "type")
+;;   )
+;; )
+;; 
+;; (define-method clear_permissions
+;;   (of-object "EphyPermissionManager")
+;;   (c-name "ephy_permission_manager_clear_permissions")
+;;   (return-type "none")
+;; )
+;; 
+;; (define-method test_permission
+;;   (of-object "EphyPermissionManager")
+;;   (c-name "ephy_permission_manager_test_permission")
+;;   (return-type "EphyPermission")
+;;   (parameters
+;;     '("const-char*" "host")
+;;     '("const-char*" "type")
+;;   )
+;; )
+;; 
+;; (define-method list_permissions
+;;   (of-object "EphyPermissionManager")
+;;   (c-name "ephy_permission_manager_list_permissions")
+;;   (return-type "GList*")
+;;   (parameters
+;;     '("const-char*" "type")
+;;   )
+;; )
+;; 
 
 
 ;; From ../../lib/egg/egg-editable-toolbar.h
@@ -3622,13 +3622,13 @@
   (gtype-id "EPHY_TYPE_NODE")
 )
 
-(define-boxed PermissionInfo
-  (in-module "Ephy")
-  (c-name "EphyPermissionInfo")
-  (gtype-id  "EPHY_TYPE_PERMISSION_INFO")
-  (fields
-    '("char*" "host")
-    '("GQuark" "type")
-    '("EphyPermission" "permission")
-  )
-)
+;; (define-boxed PermissionInfo
+;;   (in-module "Ephy")
+;;   (c-name "EphyPermissionInfo")
+;;   (gtype-id  "EPHY_TYPE_PERMISSION_INFO")
+;;   (fields
+;;     '("char*" "host")
+;;     '("GQuark" "type")
+;;     '("EphyPermission" "permission")
+;;   )
+;; )

Modified: trunk/src/epiphany.override
==============================================================================
--- trunk/src/epiphany.override	(original)
+++ trunk/src/epiphany.override	Thu Apr  3 22:00:23 2008
@@ -371,34 +371,34 @@
     return _helper_wrap_boxed_glist (EPHY_TYPE_COOKIE, list);
 }
 %%
-override ephy_permission_manager_list_permissions kwargs
-static PyObject *
-_wrap_ephy_permission_manager_list_permissions (PyGObject *self,
-                                                PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = {"type", NULL};
-    char *type;
-    GList *list;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, 
-                                     "s:EphyPermissionManager.list_permissions", kwlist, &type))
-        return NULL;
-       
-    list = ephy_permission_manager_list_permissions(EPHY_PERMISSION_MANAGER (self->obj), type);
-
-    return _helper_wrap_boxed_glist (EPHY_TYPE_PERMISSION_INFO, list);
-}
+//override ephy_permission_manager_list_permissions kwargs
+// static PyObject *
+// _wrap_ephy_permission_manager_list_permissions (PyGObject *self,
+//                                                 PyObject *args, PyObject *kwargs)
+// {
+//     static char *kwlist[] = {"type", NULL};
+//     char *type;
+//     GList *list;
+// 
+//     if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+//                                      "s:EphyPermissionManager.list_permissions", kwlist, &type))
+//         return NULL;
+// 
+//     list = ephy_permission_manager_list_permissions(EPHY_PERMISSION_MANAGER (self->obj), type);
+// 
+//     return _helper_wrap_boxed_glist (EPHY_TYPE_PERMISSION_INFO, list);
+// }
 %%
-override-attr EphyPermissionInfo.type
-static PyObject*
-_wrap_ephy_permission_info__get_type (PyObject* self, void* closure)
-{
-    const char* type;
-    
-    type = g_quark_to_string (pyg_boxed_get(self, EphyPermissionInfo)->qtype);
-    
-    return PyString_FromString (type);
-}
+// override-attr EphyPermissionInfo.type
+// static PyObject*
+// _wrap_ephy_permission_info__get_type (PyObject* self, void* closure)
+// {
+//     const char* type;
+// 
+//     type = g_quark_to_string (pyg_boxed_get(self, EphyPermissionInfo)->qtype);
+// 
+//     return PyString_FromString (type);
+// }
 %%
 override ephy_node_get_children noargs
 static PyObject *