Remove Python support.

The supported language for extensions other than C/C++ is now
JavaScript through Seed.

17 files changed, 0 insertions, 5106 deletions

diff --git a/Makefile.am b/Makefile.am
index b61a0f7b7..f5bb1e2dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,6 @@ DISTCLEANFILES = 		\
 	$(NULL)
 
 DISTCHECK_CONFIGURE_FLAGS = \
-	--enable-python			\
 	--enable-zeroconf		\
 	--enable-gtk-doc		\
 	--disable-schemas-install	\
diff --git a/README.Python b/README.Python
deleted file mode 100644
index 0720b4d0a..000000000
--- a/README.Python
+++ /dev/null
@@ -1,26 +0,0 @@
-Updating the epiphany.defs file
--------------------------------
-
-Pygtk wraps most functions itself automatically, it uses the 
-epiphany.defs file, this must be kept in-sync with the epiphany includes.
-To update the file:
-
- - Install gnome-python so that you have the "h2def.py" script
-
- - Ensure that the installed epiphany include directory is uptodate
-   (i.e. it doesn't contain any stale ephy header)
-
- - Run "python /path/to/h2def.py /path/to/include/epiphany-1.5/epiphany/* > epiphany.defs
-
- - You MUST now compare to see what has changed, e.g. the above command has the
-   following problems:
-	- It misses boxed types
-	- It doesn't mark interfaces correctly
-	- You need to ensure that no is-constructor-of lines have been lost
-
- - Basically, just do a svn diff and fix things up as appropriate.
-
- - Finally ensure it compiles, but that's obvious, right? :-)
-
-You could also make all the changes manually, but it's easier to use
-the above process.
diff --git a/configure.ac b/configure.ac
index e081544e2..e717744aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -263,107 +263,6 @@ fi
 
 AM_CONDITIONAL([ENABLE_SEED],[test "$enable_seed" = "yes"])
 
-# ******
-# Python
-# ******
-
-AC_MSG_CHECKING([whether Python support is requested])
-AC_ARG_ENABLE([python],
-	AS_HELP_STRING([--enable-python],[Enable python support]),
-	[enable_python=$enableval have_python=$enableval],
-	[enable_python=autodetect have_python=yes])
-AC_MSG_RESULT([$enable_python])
-
-if test "$enable_seed" = "yes" -a "$enable_python" != "no"; then
-  AC_MSG_ERROR([cannot enable seed and python support at the same time])
-fi
-
-if test "$have_python" != "no"; then
-	AM_PATH_PYTHON([2.3],[],[no])
-
-	if test "x$PYTHON" = "x:"; then
-		have_python=no
-	fi
-fi
-
-if test "$have_python" != "no"; then
-	AM_CHECK_PYTHON_HEADERS([],[have_python=no])
-fi
-
-if test "$have_python" != "no"; then
-	PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
-	PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
-	PYTHON_LIBS="-lpython$PYTHON_VERSION"
-	PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config"
-	PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
-	PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile"
-	PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
-	PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
-	PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
-	PYTHON_EXTRA_LIBS="$PYTHON_LOCALMODLIBS $PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS"
-	AC_SUBST([PYTHON_LIBS])
-	AC_SUBST([PYTHON_LIB_LOC])
-	AC_SUBST([PYTHON_CFLAGS])
-	AC_SUBST([PYTHON_EXTRA_LIBS])
-fi
-
-if test "$have_python" != "no"; then
-	PYGTK_REQUIRED=2.7.1
-	GNOME_PYTHON_REQUIRED=2.6.0
-
-	PKG_CHECK_MODULES([PYGTK], [pygtk-2.0 >= $PYGTK_REQUIRED gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED],
-		[],[have_python=no])
-
-	AC_SUBST([PYGTK_CFLAGS])
-	AC_SUBST([PYGTK_LIBS])
-fi
-
-if test "$have_python" != "no"; then
-	AC_MSG_CHECKING([for pygtk defs])
-	PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-	AC_MSG_RESULT([$PYGTK_DEFSDIR])
-
-	AC_MSG_CHECKING([for pygtk codegen])
-	PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
-	AC_MSG_RESULT([$PYGTK_CODEGEN])
-
-	AC_MSG_CHECKING([for pygtk h2def])
-	PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.py"
-	AC_MSG_RESULT([$PYGTK_H2DEF])
-	
-	AC_SUBST([PYGTK_DEFSDIR])
-	AC_SUBST([PYGTK_CODEGEN])
-	AC_SUBST([PYGTK_H2DEF])
-
-	# Check for -fno-strict-aliasing
-	FLAGS="-fno-strict-aliasing"
-	save_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $FLAGS"
-	AC_MSG_CHECKING([whether [$]CC understands $FLAGS])
-	AC_TRY_COMPILE([], [], [compiler_has_option=yes], [compiler_has_option=no])
-	CFLAGS="$save_CFLAGS"
-	AC_MSG_RESULT($compiler_has_option)
-	if test $compiler_has_option = yes; then
-		NO_STRICT_ALIASING_CFLAGS="$FLAGS"
-	fi
-	AC_SUBST([NO_STRICT_ALIASING_CFLAGS])
-fi
-
-if test "$have_python" != "yes"; then
-	if test "$enable_python" = "yes"; then
-		AC_MSG_ERROR([Python not found])
-	elif test "$enable_python" = "autodetect"; then
-		enable_python=no
-		AC_MSG_WARN([Python not found, disabling python support])
-	fi
-elif test "$enable_python" != "no"; then
-	enable_python=yes
-	AC_DEFINE([ENABLE_PYTHON],[1],[Define to compile with python support])
-	EPIPHANY_FEATURES="$EPIPHANY_FEATURES python"
-fi
-
-AM_CONDITIONAL([ENABLE_PYTHON],[test "$enable_python" = "yes"])
-
 AC_SUBST([EPIPHANY_FEATURES])
 
 # *******************
@@ -572,6 +471,5 @@ Epiphany was configured with the following options:
  	NetworkManager support     : $enable_network_manager
  	GObject introspection      : $enable_introspection
  	Seed support               : $enable_seed
- 	Python support             : $enable_python
  	Build tests                : $enable_tests
 "
diff --git a/data/epiphany.m4 b/data/epiphany.m4
index dd3872235..d912a0e62 100644
--- a/data/epiphany.m4
+++ b/data/epiphany.m4
@@ -27,7 +27,6 @@
 # Side effects:
 #   EPIPHANY_EXTENSIONS_DIR is set to the directory to install extensions in
 #   EPIPHANY_EXTENSION_RULE can be used to translate .ephy-extension files
-#   EPIPHANY_HAS_PYTHON is set if the epiphany is compiled with python support
 AC_DEFUN([EPIPHANY_EXTENSION_INIT],
 [
 dnl Check we have an api-version
@@ -67,18 +66,6 @@ dnl set the EPIPHANY_EXTENSIONS_DIR variable
 EPIPHANY_EXTENSIONS_DIR="`$PKG_CONFIG --variable=extensionsdir epiphany-$_epiphany_api_version`"
 AC_SUBST([EPIPHANY_EXTENSIONS_DIR])
 
-dnl Look to see if epiphany has python support
-AC_MSG_CHECKING([whether epiphany has python support])
-_epiphany_features="`$PKG_CONFIG --variable=features epiphany-$_epiphany_api_version`"
-if echo "$_epiphany_features" | egrep '(^| )(python)($| )' > /dev/null; then
-    result=yes
-    EPIPHANY_HAS_PYTHON=1
-    AC_SUBST([EPIPHANY_HAS_PYTHON])
-else
-    result=no
-fi
-AC_MSG_RESULT([$result])
-
 dnl Add a rule that auto-translates the .ephy-extension files
 dnl (like the INTLTOOL_XML_RULE does for xml files)
 EPIPHANY_EXTENSION_RULE='%.ephy-extension: %.ephy-extension.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 7743419cb..a67c05f10 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -139,14 +139,6 @@ GTKDOC_LIBS = \
 	$(DBUS_LIBS) \
 	$(LIBINTL)
 
-if ENABLE_PYTHON
-GTKDOC_LIBS += \
-	$(top_builddir)/src/libpyphany.la	\
-	$(PYTHON_LIB_LOC) $(PYTHON_LIBS)	\
-	$(PYTHON_EXTRA_LIBS)			\
-	$(PYGTK_LIBS)
-endif
-
 if ENABLE_SEED
 GTKDOC_LIBS += \
 	$(SEED_LIBS)
diff --git a/m4/python.m4 b/m4/python.m4
deleted file mode 100644
index e1c5266de..000000000
--- a/m4/python.m4
+++ /dev/null
@@ -1,62 +0,0 @@
-## this one is commonly used with AM_PATH_PYTHONDIR ...
-dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
-dnl Check if a module containing a given symbol is visible to python.
-AC_DEFUN([AM_CHECK_PYMOD],
-[AC_REQUIRE([AM_PATH_PYTHON])
-py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
-ifelse([$2],[], [prog="
-import sys
-try:
-        import $1
-except ImportError:
-        sys.exit(1)
-except:
-        sys.exit(0)
-sys.exit(0)"], [prog="
-import $1
-$1.$2"])
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-  then
-    eval "py_cv_mod_$py_mod_var=yes"
-  else
-    eval "py_cv_mod_$py_mod_var=no"
-  fi
-])
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
-if test "x$py_val" != xno; then
-  AC_MSG_RESULT(yes)
-  ifelse([$3], [],, [$3
-])dnl
-else
-  AC_MSG_RESULT(no)
-  ifelse([$4], [],, [$4
-])dnl
-fi
-])
-
-dnl a macro to check for ability to create python extensions
-dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-dnl function also defines PYTHON_INCLUDES
-AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
-[AC_REQUIRE([AM_PATH_PYTHON])
-AC_MSG_CHECKING(for headers required to compile python extensions)
-dnl deduce PYTHON_INCLUDES
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-if test "$py_prefix" != "$py_exec_prefix"; then
-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-fi
-AC_SUBST(PYTHON_INCLUDES)
-dnl check if the headers exist:
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-AC_TRY_CPP([#include <Python.h>],dnl
-[AC_MSG_RESULT(found)
-$1],dnl
-[AC_MSG_RESULT(not found)
-$2])
-CPPFLAGS="$save_CPPFLAGS"
-])
diff --git a/src/Makefile.am b/src/Makefile.am
index ba06c426d..01f25f76c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,10 +4,6 @@ NULL =
 
 noinst_LTLIBRARIES = libephymain.la
 
-if ENABLE_PYTHON
-noinst_LTLIBRARIES += libpyphany.la
-endif
-
 bin_PROGRAMS = epiphany
 
 EXTRA_DIST =
@@ -142,64 +138,6 @@ libephymain_la_SOURCES += \
 libephymain_la_CFLAGS += $(SEED_CFLAGS)
 endif # ENABLE_SEED
 
-if ENABLE_PYTHON
-NOINST_H_FILES += \
-	ephy-python.h		\
-	ephy-python-extension.h	\
-	ephy-python-loader.h
-
-BUILT_PYPHANY_SOURCE = epiphany.c
-
-libpyphany_la_SOURCES = \
-	ephy-python.c		\
-	ephy-python.h		\
-	ephy-python-extension.c	\
-	ephy-python-extension.h	\
-	ephy-python-loader.c	\
-	ephy-python-loader.h
-
-nodist_libpyphany_la_SOURCES = \
-	$(BUILT_PYPHANY_SOURCE)
-
-libpyphany_la_CPPFLAGS = \
-	-I$(top_srcdir)/lib		\
-	-I$(top_srcdir)/lib/widgets	\
-	-I$(top_srcdir)/lib/egg		\
-	-I$(top_srcdir)/embed		\
-	-I$(top_srcdir)/embed/$(with_engine)	\
-	-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)/src		\
-	-I$(top_builddir)/src/bookmarks	\
-	$(PYTHON_INCLUDES)		\
-	-DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" 	\
-	-DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\"		\
-	-DDATADIR=\""$(datadir)"\" 	\
-	$(AM_CPPFLAGS)
-
-libpyphany_la_CFLAGS = \
-	$(DEPENDENCIES_CFLAGS)		\
-	$(NO_STRICT_ALIASING_CFLAGS)	\
-	$(DBUS_CFLAGS)			\
-	$(PYGTK_CFLAGS)			\
-	$(AM_CFLAGS)
-
-libpyphany_la_LDFLAGS = \
-	-export-symbols-regex ephy_python_init
-
-libpyphany_la_LIBADD = \
-	$(DEPENDENCIES_LIBS)			\
-	$(PYTHON_LIB_LOC) $(PYTHON_LIBS)	\
-	$(PYTHON_EXTRA_LIBS)			\
-	$(PYGTK_LIBS)
-endif
-
-
 epiphany_SOURCES = ephy-main.c
 
 epiphany_CPPFLAGS = \
@@ -242,21 +180,6 @@ if ENABLE_SEED
 epiphany_LDADD += $(SEED_LIBS)
 endif # ENABLE_SEED
 
-if ENABLE_PYTHON
-epiphany_LDADD += \
-	libpyphany.la				\
-	$(PYTHON_LIB_LOC) $(PYTHON_LIBS)	\
-	$(PYTHON_EXTRA_LIBS)			\
-	$(PYGTK_LIBS)
-
-pydefsdir = $(datadir)/pygtk/2.0/defs
-pydefs_DATA = epiphany.defs
-endif
-
-EXTRA_DIST += \
-	epiphany.defs		\
-	epiphany.override
-
 if ENABLE_NETWORK_MANAGER
 epiphany_LDADD += \
 	$(NETWORK_MANAGER_LIBS)
@@ -272,10 +195,6 @@ TYPES_SOURCE = \
 	ephy-type-builtins.c	\
 	ephy-type-builtins.h
 
-if ENABLE_PYTHON
-BUILT_SOURCES += $(BUILT_PYPHANY_SOURCE)
-endif
-
 stamp_files = \
 	stamp-ephy-type-builtins.c	\
 	stamp-ephy-type-builtins.h	\
@@ -340,186 +259,10 @@ stamp-ephy-dbus-client-bindings.h: $(top_srcdir)/data/epiphany-service.xml Makef
 	&& rm -f xgen-$(@F) \
 	&& echo timestamp > $(@F)
 
-epiphany.c: epiphany.defs epiphany.override
-	( cd $(srcdir) && $(PYGTK_CODEGEN) \
-		--register $(PYGTK_DEFSDIR)/pango-types.defs \
-		--register $(PYGTK_DEFSDIR)/gdk-types.defs \
-		--register $(PYGTK_DEFSDIR)/gtk-types.defs \
-		--override $*.override \
-		--prefix py$* $(<F) ) > $@ 
-
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 
-# update rules for python bindings
-if ENABLE_PYTHON
-
-BINDING_HEADERS_SRCDIR_IN = \
-	embed/ephy-command-manager.h			\
-	embed/ephy-embed-event.h			\
-	embed/ephy-embed.h				\
-	embed/ephy-embed-persist.h			\
-	embed/ephy-embed-shell.h			\
-	embed/ephy-embed-single.h			\
-	embed/ephy-favicon-cache.h			\
-	embed/ephy-history.h				\
-	embed/ephy-password-manager.h			\
-	embed/ephy-permission-manager.h			\
-	lib/ephy-dialog.h				\
-	lib/ephy-node-db.h				\
-	lib/ephy-node.h					\
-	lib/ephy-state.h				\
-	lib/egg/egg-editable-toolbar.h			\
-	lib/egg/egg-toolbars-model.h			\
-	lib/widgets/ephy-search-entry.h			\
-	lib/widgets/ephy-spinner.h			\
-	src/bookmarks/ephy-bookmarks.h			\
-	src/ephy-extension.h				\
-	src/ephy-extensions-manager.h			\
-	src/ephy-find-toolbar.h				\
-	src/ephy-link-action.h				\
-	src/ephy-link.h					\
-	src/ephy-location-action.h			\
-	src/ephy-notebook.h				\
-	src/ephy-session.h				\
-	src/ephy-shell.h				\
-	src/ephy-statusbar.h				\
-	src/ephy-toolbar.h				\
-	src/ephy-web-view.h				\
-	src/ephy-window.h
-
-BINDING_HEADERS_SRCDIR_IGNORE_IN = \
-	embed/downloader-view.h				\
-	embed/ephy-embed-dialog.h			\
-	embed/ephy-embed-find.h				\
-	embed/ephy-embed-prefs.h			\
-	embed/ephy-encodings.h				\
-	embed/print-dialog.h				\
-	lib/eel-gconf-extensions.h			\
-	lib/ephy-debug.h				\
-	lib/ephy-dnd.h					\
-	lib/ephy-file-chooser.h				\
-	lib/ephy-file-helpers.h				\
-	lib/ephy-glade.h				\
-	lib/ephy-gui.h					\
-	lib/ephy-langs.h				\
-	lib/ephy-loader.h				\
-	lib/ephy-module.h				\
-	lib/ephy-node-common.h				\
-	lib/ephy-node-filter.h				\
-	lib/ephy-object-helpers.h			\
-	lib/ephy-prefs.h				\
-	lib/ephy-shlib-loader.h				\
-	lib/ephy-signal-accumulator.h			\
-	lib/ephy-stock-icons.h				\
-	lib/ephy-string.h				\
-	lib/ephy-zoom.h					\
-	lib/egg/eggintl.h				\
-	lib/egg/eggmarshalers.h				\
-	lib/egg/eggstatusicon.h				\
-	lib/egg/eggtrayicon.h				\
-	lib/egg/eggtraymanager.h			\
-	lib/egg/eggtreemultidnd.h			\
-	lib/egg/egg-toolbar-editor.h			\
-	lib/widgets/ephy-location-entry.h		\
-	lib/widgets/ephy-node-view.h			\
-	lib/widgets/ephy-tree-model-node.h		\
-	lib/widgets/ephy-tree-model-sort.h		\
-	lib/widgets/ephy-zoom-action.h			\
-	lib/widgets/ephy-zoom-control.h			\
-	src/bookmarks/ephy-bookmark-action.h		\
-	src/bookmarks/ephy-bookmark-properties.h	\
-	src/bookmarks/ephy-bookmarksbar-model.h		\
-	src/bookmarks/ephy-bookmarks-editor.h		\
-	src/bookmarks/ephy-bookmarks-export.h		\
-	src/bookmarks/ephy-bookmarks-import.h		\
-	src/bookmarks/ephy-bookmarks-menu.h		\
-	src/bookmarks/ephy-favorites-menu.h		\
-	src/bookmarks/ephy-topic-action.h		\
-	src/bookmarks/ephy-topics-palette.h		\
-	src/bookmarks/ephy-bookmark-action-group.h	\
-	src/bookmarks/ephy-bookmark-factory-action.h	\
-	src/bookmarks/ephy-bookmarks-ui.h		\
-	src/bookmarks/ephy-nodes-cover.h		\
-	src/bookmarks/ephy-open-tabs-action.h		\
-	src/bookmarks/ephy-related-action.h		\
-	src/bookmarks/ephy-topic-action-group.h		\
-	src/bookmarks/ephy-topic-factory-action.h	\
-	src/ephy-action-helper.h			\
-	src/ephy-activation.h				\
-	src/ephy-completion-model.h			\
-	src/ephy-dbus.h					\
-	src/ephy-encoding-dialog.h			\
-	src/ephy-encoding-menu.h			\
-	src/ephy-fullscreen-popup.h			\
-	src/ephy-go-action.h				\
-	src/ephy-history-window.h			\
-	src/ephy-home-action.h				\
-	src/ephy-lockdown.h				\
-	src/ephy-navigation-action.h			\
-	src/ephy-python-extension.h			\
-	src/ephy-python.h				\
-	src/ephy-python-loader.h			\
-	src/ephy-tabs-menu.h				\
-	src/ephy-toolbar-editor.h			\
-	src/ephy-toolbars-model.h			\
-	src/languages.h					\
-	src/pdm-dialog.h				\
-	src/popup-commands.h				\
-	src/ppview-toolbar.h				\
-	src/prefs-dialog.h				\
-	src/window-commands.h
-
-BINDING_HEADERS_BUILDDIR_IN = \
-	embed/ephy-embed-type-builtins.h		\
-	lib/egg/eggtypebuiltins.h			\
-	lib/ephy-lib-type-builtins.h			\
-	src/bookmarks/ephy-bookmarks-type-builtins.h	\
-	src/ephy-type-builtins.h
-
-BINDING_HEADERS_BUILDDIR_IGNORE_IN = \
-        config.h					\
-        embed/stamp-ephy-embed-type-builtins.h		\
-	lib/ephy-marshal.h				\
-        lib/egg/eggmarshalers.h				\
-        lib/egg/eggtypebuiltins.h			\
-	lib/egg/stamp-eggmarshalers.h			\
-	lib/egg/stamp-eggtypebuiltins.h			\
-        lib/ephy-marshal.h				\
-        lib/stamp-ephy-lib-type-builtins.h		\
-        lib/stamp-ephy-marshal.h			\
-        src/EphyAutomation.h				\
-        src/stamp-ephy-type-builtins.h			\
-	src/bookmarks/stamp-ephy-bookmarks-type-builtins.h
-
-BINDING_HEADERS_SRCDIR		:= $(addprefix $(top_srcdir)/,$(BINDING_HEADERS_SRCDIR_IN))
-BINDING_HEADERS_SRCDIR_IGNORE	:= $(addprefix $(top_srcdir)/,$(BINDING_HEADERS_SRCDIR_IGNORE_IN))
-BINDING_HEADERS_BUILDDIR	:= $(addprefix $(top_builddir)/,$(BINDING_HEADERS_BUILDDIR_IN))
-BINDING_HEADERS_BUILDDIR_IGNORE	:= $(addprefix $(top_builddir)/,$(BINDING_HEADERS_BUILDDIR_IGNORE_IN))
-
-BINDING_HEADERS_ALL = $(shell find $(top_srcdir) $(top_builddir) -type f -name "*.h"  \
-	               -a ! -wholename "*/mozilla/*" -print| sort | uniq)
-
-BINDING_HEADERS_ALL_KNOWN = \
-	$(BINDING_HEADERS_SRCDIR) 		\
-	$(BINDING_HEADERS_SRCDIR_IGNORE)	\
-	$(BINDING_HEADERS_BUILDDIR)		\
-	$(BINDING_HEADERS_BUILDDIR_IGNORE)
-
-BINDING_HEADERS_ALL_UNKNOWN = $(filter-out $(BINDING_HEADERS_ALL_KNOWN),$(BINDING_HEADERS_ALL))
-
-regenerate-python-binding:
-	$(PYGTK_H2DEF) $(sort $(BINDING_HEADERS_SRCDIR) $(BINDING_HEADERS_BUILDDIR)) > epiphany.defs.new
-
-check-python-binding:
-	@echo "$(BINDING_HEADERS_ALL_UNKNOWN)"
-	@test -z "$(BINDING_HEADERS_ALL_UNKNOWN)"
-
-#check-local: check-python-binding
-
-endif # ENABLE_PYTHON
-
 if ENABLE_INTROSPECTION
 EPHY_GIR_H_FILES = \
 	$(top_srcdir)/embed/ephy-command-manager.h \
diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c
index bd195c616..fd4d34635 100644
--- a/src/ephy-extensions-manager.c
+++ b/src/ephy-extensions-manager.c
@@ -55,11 +55,6 @@
 #include <dirent.h>
 #include <string.h>
 
-#ifdef ENABLE_PYTHON
-#include "ephy-python-extension.h"
-#include "ephy-python-loader.h"
-#endif
-
 #ifdef ENABLE_SEED
 #include "ephy-seed-loader.h"
 #endif
@@ -583,18 +578,7 @@ get_loader_for_type (EphyExtensionsManager *manager,
 	}
 	if (strcmp (type, "python") == 0)
 	{
-#ifdef ENABLE_PYTHON
-		info = g_new (LoaderInfo, 1);
-		info->type = g_strdup (type);
-		info->loader = g_object_new (EPHY_TYPE_PYTHON_LOADER, NULL);
-
-		manager->priv->factories =
-				g_list_append (manager->priv->factories, info);
-
-		return g_object_ref (info->loader);
-#else
 		return NULL;
-#endif
 	}
 
 #ifdef ENABLE_SEED
diff --git a/src/ephy-python-extension.c b/src/ephy-python-extension.c
deleted file mode 100644
index b0aeb0857..000000000
--- a/src/ephy-python-extension.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- *  Copyright © 2003 Marco Pesenti Gritti
- *  Copyright © 2003 Christian Persch
- *  Copyright © 2004, 2005 Adam Hooper
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "Python.h"
-
-#include "config.h"
-
-#include "ephy-python-extension.h"
-#include "ephy-python.h"
-
-#define NO_IMPORT_PYGOBJECT
-#include <pygobject.h>
-
-#include "ephy-extension.h"
-#include "ephy-window.h"
-#include "ephy-file-helpers.h"
-#include "ephy-debug.h"
-
-static void ephy_python_extension_iface_init (EphyExtensionIface *iface);
-
-#define EPHY_PYTHON_EXTENSION_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_PYTHON_EXTENSION, EphyPythonExtensionPrivate))
-
-struct _EphyPythonExtensionPrivate
-{
-	char *filename;
-	PyObject *module;
-};
-
-enum
-{
-	PROP_0,
-	PROP_FILENAME
-};
-
-static int
-set_python_search_path (const char *filename)
-{
-	char *dirname;
-	char *dot_dir;
-	int ret = 2;
-	PyObject *sys_path;
-	PyObject *pValue;
-
-	sys_path = PySys_GetObject ("path");
-
-	/* Systems extensions dir */
-	pValue = PyString_FromString (EXTENSIONS_DIR);
-	PyList_Insert (sys_path, 0, pValue);
-	Py_DECREF (pValue);
-
-	/* Home dir */
-	dot_dir = g_strconcat (ephy_dot_dir (), "/extensions", NULL);
-	pValue = PyString_FromString (dot_dir);
-	PyList_Insert (sys_path, 0, pValue);
-	Py_DECREF (pValue);
-	g_free (dot_dir);
-
-	/* Absolute path specified in .xml file */
-	dirname = g_path_get_dirname (filename);
-	if (g_path_is_absolute (dirname))
-	{
-		pValue = PyString_FromString (dirname);
-		PyList_Insert (sys_path, 0, pValue);
-		Py_DECREF (pValue);
-		ret++;
-	}
-	g_free (dirname);
-
-	return ret;
-}
-
-static void
-unset_python_search_path (int num_dirs)
-{
-	PyObject *sys_path = PySys_GetObject ("path");
-
-	PySequence_DelSlice (sys_path, 0, num_dirs);
-}
-
-static void
-ephy_python_extension_init (EphyPythonExtension *extension)
-{
-	LOG ("EphyPythonExtension initialising");
-
-	extension->priv = EPHY_PYTHON_EXTENSION_GET_PRIVATE (extension);
-}
-
-static void
-call_python_func (EphyExtension *extension,
-		  const char *func_name,
-		  EphyWindow *window,
-		  EphyEmbed *embed) /* HACK: tab may be NULL */
-{
-	PyObject *pDict, *pFunc;
-	PyObject *pArgs, *pValue, *pEmbed = NULL, *pWindow;
-	EphyPythonExtension *py_ext;
-	
-	py_ext = EPHY_PYTHON_EXTENSION (extension);
-
-        /* Happens if the module load fails, e.g. python couldn't
-         * parse it, so be quiet about it, we will have already warned */
-        if (py_ext->priv->module == NULL)
-	{
-		return;
-	}
-
-	pDict = PyModule_GetDict (py_ext->priv->module);
-	pFunc = PyDict_GetItemString (pDict, func_name);
-
-	if (pFunc && PyCallable_Check (pFunc))
-	{
-		pArgs = PyTuple_New (embed == NULL ? 1 : 2);
-
-		pWindow = pygobject_new (G_OBJECT (window));
-		PyTuple_SetItem (pArgs, 0, pWindow);
-
-		if (embed != NULL)
-		{
-			pEmbed = pygobject_new (G_OBJECT (embed));
-			PyTuple_SetItem (pArgs, 1, pEmbed);
-		}
-
-		pValue = PyObject_CallObject (pFunc, pArgs);
-		if (pValue == NULL)
-		{
-			PyErr_Print ();
-			PyErr_Clear ();
-			g_warning ("Python code for '%s' failed to execute",
-				   func_name);
-		}
-		Py_XDECREF (pValue);
-		Py_DECREF (pArgs);
-	}
-	else
-	{
-		if (PyErr_Occurred ())
-		{
-			PyErr_Print ();
-			PyErr_Clear ();
-		}
-	}
-}
-
-static void
-impl_attach_tab (EphyExtension *extension,
-		 EphyWindow *window,
-		 EphyEmbed *embed)
-{
-	call_python_func (extension, "attach_tab", window, embed);
-}
-
-static void
-impl_detach_tab (EphyExtension *extension,
-		 EphyWindow *window,
-		 EphyEmbed *embed)
-{
-	call_python_func (extension, "detach_tab", window, embed);
-
-	ephy_python_schedule_gc ();
-}
-
-static void
-impl_attach_window (EphyExtension *extension,
-		    EphyWindow *window)
-{
-	call_python_func (extension, "attach_window", window, NULL);
-}
-
-static void
-impl_detach_window (EphyExtension *extension,
-		    EphyWindow *window)
-{
-	call_python_func (extension, "detach_window", window, NULL);
-
-	ephy_python_schedule_gc ();
-}
-
-static void
-ephy_python_extension_iface_init (EphyExtensionIface *iface)
-{
-	iface->attach_tab = impl_attach_tab;
-	iface->detach_tab = impl_detach_tab;
-	iface->attach_window = impl_attach_window;
-	iface->detach_window = impl_detach_window;
-}
-
-G_DEFINE_TYPE_WITH_CODE (EphyPythonExtension, ephy_python_extension, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_EXTENSION,
-                                                ephy_python_extension_iface_init))
-
-static GObject *
-ephy_python_extension_constructor (GType type,
-				   guint n_construct_properties,
-				   GObjectConstructParam *construct_params)
-{
-	GObject *object;
-	EphyPythonExtension *ext;
-	char *module_name;	/* filename minus optional ".py" */
-				/* Note: could equally be a directory */
-	PyObject *pModules, *pModule, *pReload;
-			  
-	int num_temp_paths;
-
-	object = G_OBJECT_CLASS (ephy_python_extension_parent_class)->constructor (type,
-                                                                                   n_construct_properties,
-                                                                                   construct_params);
-
-	ext = EPHY_PYTHON_EXTENSION (object);
-
-	module_name = g_path_get_basename (ext->priv->filename);
-
-	num_temp_paths = set_python_search_path (ext->priv->filename);
-
-	pModules = PySys_GetObject ("modules");
-	g_assert (pModules != NULL);
-
-	pModule = PyDict_GetItemString (pModules, module_name);
-
-	if (pModule == NULL)
-	{
-		pModule = PyImport_ImportModule (module_name);
-
-		if (pModule == NULL)
-		{
-			PyErr_Print ();
-			PyErr_Clear ();
-			g_warning ("Could not initialize Python module '%s'",
-				   module_name);
-		}
-	}
-	else
-	{
-		pReload = PyImport_ReloadModule (pModule);
-
-		if (pReload == NULL)
-		{
-			PyErr_Print ();
-			PyErr_Clear ();
-			g_warning ("Could not reload Python module '%s'\n"
-				   "Falling back to previous version",
-				   module_name);
-		}
-		else
-		{
-			Py_DECREF (pReload);
-		}
-	}
-
-	unset_python_search_path (num_temp_paths);
-
-	ext->priv->module = pModule;
-
-	g_free (module_name);
-
-	return object;
-}
-
-static void
-ephy_python_extension_finalize (GObject *object)
-{
-	EphyPythonExtension *extension =
-			EPHY_PYTHON_EXTENSION (object);
-
-	LOG ("EphyPythonExtension finalizing");
-
-	g_free (extension->priv->filename);
-	Py_XDECREF (extension->priv->module);
-
-	G_OBJECT_CLASS (ephy_python_extension_parent_class)->finalize (object);
-}
-
-static void
-ephy_python_extension_get_property (GObject *object,
-				    guint prop_id,
-				    GValue *value,
-				    GParamSpec *pspec)
-{
-	/* no readable properties */
-	g_return_if_reached ();
-}
-
-static void
-ephy_python_extension_set_property (GObject *object,
-				    guint prop_id,
-				    const GValue *value,
-				    GParamSpec *pspec)
-{
-	EphyPythonExtension *ext = EPHY_PYTHON_EXTENSION (object);
-
-	switch (prop_id)
-	{
-		case PROP_FILENAME:
-			ext->priv->filename = g_value_dup_string (value);
-			break;
-		default:
-			g_return_if_reached ();
-	}
-}
-
-static void
-ephy_python_extension_class_init (EphyPythonExtensionClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = ephy_python_extension_finalize;
-	object_class->constructor = ephy_python_extension_constructor;
-	object_class->get_property = ephy_python_extension_get_property;
-	object_class->set_property = ephy_python_extension_set_property;
-
-	g_object_class_install_property
-			(object_class,
-			 PROP_FILENAME,
-			 g_param_spec_string ("filename",
-					      "Filename",
-					      "Filename",
-					      NULL,
-					      G_PARAM_WRITABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_CONSTRUCT_ONLY));
-
-	g_type_class_add_private (object_class, sizeof (EphyPythonExtensionPrivate));
-}
-
diff --git a/src/ephy-python-extension.h b/src/ephy-python-extension.h
deleted file mode 100644
index eb54bf256..000000000
--- a/src/ephy-python-extension.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright © 2003 Marco Pesenti Gritti
- *  Copyright © 2003 Christian Persch
- *  Copyright © 2004, 2005 Adam Hooper
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
-#ifndef EPHY_PYTHON_EXTENSION_H
-#define EPHY_PYTHON_EXTENSION_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define EPHY_TYPE_PYTHON_EXTENSION		(ephy_python_extension_get_type ())
-#define EPHY_PYTHON_EXTENSION(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_PYTHON_EXTENSION, EphyPythonExtension))
-#define EPHY_PYTHON_EXTENSION_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PYTHON_EXTENSION, EphyPythonExtensionClass))
-#define EPHY_IS_PYTHON_EXTENSION(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_PYTHON_EXTENSION))
-#define EPHY_IS_PYTHON_EXTENSION_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PYTHON_EXTENSION))
-#define EPHY_PYTHON_EXTENSION_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_PYTHON_EXTENSION, EphyPythonExtensionClass))
-
-typedef struct _EphyPythonExtension		EphyPythonExtension;
-typedef struct _EphyPythonExtensionClass	EphyPythonExtensionClass;
-typedef struct _EphyPythonExtensionPrivate	EphyPythonExtensionPrivate;
-
-struct _EphyPythonExtensionClass
-{
-	GObjectClass parent_class;
-};
-
-struct _EphyPythonExtension
-{
-	GObject parent_instance;
-
-	/*< private >*/
-	EphyPythonExtensionPrivate *priv;
-};
-
-GType	ephy_python_extension_get_type		(void);
-
-G_END_DECLS
-
-#endif
diff --git a/src/ephy-python-loader.c b/src/ephy-python-loader.c
deleted file mode 100644
index 79ca41c7a..000000000
--- a/src/ephy-python-loader.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  Copyright © 2003 Marco Pesenti Gritti
- *  Copyright © 2003, 2004, 2005 Christian Persch
- *  Copyright © 2004, 2005 Jean-François Rameau
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-
-#include "ephy-python-loader.h"
-#include "ephy-loader.h"
-#include "ephy-python.h"
-#include "ephy-python-extension.h"
-#include "ephy-debug.h"
-
-#define EPHY_PYTHON_LOADER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_PYTHON_LOADER, EphyPythonLoaderPrivate))
-
-struct _EphyPythonLoaderPrivate
-{
-	gpointer dummy;
-};
-
-static GObject *
-impl_get_object (EphyLoader *eloader,
-		 GKeyFile *keyfile)
-{
-	char *filename;
-	GObject *object;
-
-	g_return_val_if_fail (keyfile != NULL, NULL);
-
-	filename = g_key_file_get_string (keyfile, "Loader", "Module", NULL);
-	if (filename == NULL)
-	{
-		g_warning ("NULL module name!\n");
-		return NULL;
-	}
-
-	object = g_object_new (EPHY_TYPE_PYTHON_EXTENSION,
-			       "filename", filename,
-			       NULL);
-
-	g_free (filename);
-
-	/* we own one ref */
-	return g_object_ref (object);
-}
-
-static void
-impl_release_object (EphyLoader *eloader,
-		     GObject *object)
-{
-	g_return_if_fail (object != NULL);
-
-	g_object_unref (object);
-}
-
-static void
-ephy_python_loader_iface_init (EphyLoaderIface *iface)
-{
-	iface->type = "python";
-	iface->get_object = impl_get_object;
-	iface->release_object = impl_release_object;
-}
-
-G_DEFINE_TYPE_WITH_CODE (EphyPythonLoader, ephy_python_loader, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_LOADER, ephy_python_loader_iface_init))
-
-static void
-ephy_python_loader_init (EphyPythonLoader *loader)
-{
-	loader->priv = EPHY_PYTHON_LOADER_GET_PRIVATE (loader);
-
-	LOG ("EphyPythonLoader initialising");
-
-	/* Initialize Python engine */
-	ephy_python_init ();
-}
-
-static void
-ephy_python_loader_finalize (GObject *object)
-{
-	LOG ("EphyPythonLoader finalising");
-
-	G_OBJECT_CLASS (ephy_python_loader_parent_class)->finalize (object);
-
-	ephy_python_shutdown ();
-}
-
-static void
-ephy_python_loader_class_init (EphyPythonLoaderClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = ephy_python_loader_finalize;
-
-	g_type_class_add_private (object_class, sizeof (EphyPythonLoaderPrivate));
-}
-
diff --git a/src/ephy-python-loader.h b/src/ephy-python-loader.h
deleted file mode 100644
index 1f2d5ae76..000000000
--- a/src/ephy-python-loader.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright © 2003 Marco Pesenti Gritti
- *  Copyright © 2003, 2004, 2005 Christian Persch
- *  Copyright © 2004, 2005 Jean-François Rameau
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
-#ifndef EPHY_PYTHON_LOADER_H
-#define EPHY_PYTHON_LOADER_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define EPHY_TYPE_PYTHON_LOADER		(ephy_python_loader_get_type ())
-#define EPHY_PYTHON_LOADER(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_PYTHON_LOADER, EphyPythonLoader))
-#define EPHY_PYTHON_LOADER_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PYTHON_LOADER, EphyPythonLoaderClass))
-#define EPHY_IS_PYTHON_LOADER(o)	(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_PYTHON_LOADER))
-#define EPHY_IS_PYTHON_LOADER_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PYTHON_LOADER))
-#define EPHY_PYTHON_LOADER_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_PYTHON_LOADER, EphyPythonLoaderClass))
-
-typedef struct _EphyPythonLoader	EphyPythonLoader;
-typedef struct _EphyPythonLoaderClass	EphyPythonLoaderClass;
-typedef struct _EphyPythonLoaderPrivate	EphyPythonLoaderPrivate;
-
-struct _EphyPythonLoaderClass
-{
-	GObjectClass parent_class;
-};
-
-struct _EphyPythonLoader
-{
-	GObject parent_instance;
-
-	/*< private >*/
-	EphyPythonLoaderPrivate *priv;
-};
-
-GType	ephy_python_loader_get_type		(void);
-
-G_END_DECLS
-
-#endif /* !EPHY_PYTHON_LOADER_H */
diff --git a/src/ephy-python.c b/src/ephy-python.c
deleted file mode 100644
index 0a1f7e074..000000000
--- a/src/ephy-python.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *  Copyright © 2004, 2005 Jean-François Rameau
- *  Copyright © 2004, 2005 Adam Hooper
- *  Copyright © 2004, 2005 Crispin Flowerday
- *  Copyright © 2004, 2005 Christian Persch
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include <Python.h>
-
-#include "config.h"
-
-#include "ephy-python.h"
-#include "ephy-debug.h"
-
-#include <pygobject.h>
-#include <pygtk/pygtk.h>
-
-void pyepiphany_register_classes (PyObject *d); 
-void pyepiphany_add_constants (PyObject *module, const gchar *strip_prefix);
-
-extern PyMethodDef pyepiphany_functions[];
-
-static guint idle_gc_handler	   = 0;
-static guint idle_shutdown_handler = 0;
-static gboolean python_initialised = FALSE;
-
-void
-ephy_python_init (void)
-{
-	char *argv[1];
-	PyObject *m, *d;
-	
-	Py_Initialize();
-	python_initialised = TRUE;
-
-	argv[0] = g_get_prgname ();
-	PySys_SetArgv (1, argv);
-
-	init_pygobject ();
-	init_pygtk ();
-
-	m = Py_InitModule ("epiphany", pyepiphany_functions);
-	d = PyModule_GetDict (m);
-
-	pyepiphany_register_classes (d);
-	pyepiphany_add_constants (m, "EPHY_");
-}
-
-static gboolean
-idle_shutdown (void)
-{
-	g_return_val_if_fail (idle_gc_handler == 0, FALSE);
-
-	Py_Finalize ();
-
-	idle_shutdown_handler = 0;
-	return FALSE;
-}
-
-void
-ephy_python_shutdown (void)
-{
-	if (!python_initialised) return;
-
-	g_return_if_fail (idle_shutdown_handler == 0);
-
-	LOG ("EphyPython shutdown with %s GC scheduled",
-	     idle_gc_handler != 0 ? "a" : "no");
-
-	if (idle_gc_handler != 0)
-	{
-		/* Process remaining GCs now */
-		while (PyGC_Collect ()) ;
-
-		g_source_remove (idle_gc_handler);
-		idle_gc_handler = 0;
-
-		/* IMPORTANT! We get here while running PyGC_Collect from idle!
-		 * Don't do Py_Finalize while inside python!
-		 */
-		idle_shutdown_handler = g_idle_add ((GSourceFunc) idle_shutdown, NULL);
-	}
-	else
-	{
-		Py_Finalize();
-	}
-}
-
-static gboolean
-idle_gc (void)
-{
-	long value;
-
-	/* LOG ("Running GC from idle"); */
-
-	/* FIXME what does the return value of PyGC_Collect mean? */
-	value = PyGC_Collect ();
-
-	/* LOG ("Idle GC returned %ld", value); */
-
-	if (value == 0)
-	{
-		idle_gc_handler = 0;
-	}
-
-	return value != 0;
-}
-
-void
-ephy_python_schedule_gc (void)
-{
-	/* LOG ("Scheduling a GC with %s GC already scheduled", idle_gc_handler != 0 ? "a" : "no"); */
-
-	if (python_initialised && idle_gc_handler == 0)
-	{
-		idle_gc_handler = g_idle_add ((GSourceFunc) idle_gc, NULL);
-	}
-}
diff --git a/src/ephy-python.h b/src/ephy-python.h
deleted file mode 100644
index 125e6e530..000000000
--- a/src/ephy-python.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright © 2005 Christian Persch
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
-#ifndef EPHY_PYTHON_H
-#define EPHY_PYTHON_H
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-void ephy_python_init	     (void);
-
-void ephy_python_shutdown    (void);
-
-void ephy_python_schedule_gc (void);
-
-G_END_DECLS
-
-#endif
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 5b593a814..c8b117303 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -69,10 +69,6 @@
 #include <X11/XF86keysym.h>
 #endif
 
-#ifdef ENABLE_PYTHON
-#include "ephy-python.h"
-#endif
-
 static void ephy_window_class_init		(EphyWindowClass *klass);
 static void ephy_window_init			(EphyWindow *gs);
 static GObject *ephy_window_constructor		(GType type,
@@ -3853,10 +3849,6 @@ ephy_window_finalize (GObject *object)
 
 	LOG ("EphyWindow finalised %p", object);
 
-#ifdef ENABLE_PYTHON
-	ephy_python_schedule_gc ();
-#endif
-
 	g_object_unref (ephy_shell);
 }
 
diff --git a/src/epiphany.defs b/src/epiphany.defs
deleted file mode 100644
index 8465d3a28..000000000
--- a/src/epiphany.defs
+++ /dev/null
@@ -1,3437 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object EditableToolbar
-  (in-module "Egg")
-  (parent "GtkVBox")
-  (c-name "EggEditableToolbar")
-  (gtype-id "EGG_TYPE_EDITABLE_TOOLBAR")
-)
-
-(define-object Bookmarks
-  (in-module "Ephy")
-  (parent "GObject")
-  (c-name "EphyBookmarks")
-  (gtype-id "EPHY_TYPE_BOOKMARKS")
-)
-
-(define-interface CommandManager
-  (in-module "Ephy")
-  (c-name "EphyCommandManager")
-  (gtype-id "EPHY_TYPE_COMMAND_MANAGER")
-)
-
-(define-object Dialog
-  (in-module "Ephy")
-  (parent "GObject")
-  (c-name "EphyDialog")
-  (gtype-id "EPHY_TYPE_DIALOG")
-)
-
-(define-interface EmbedContainer
-  (in-module "Ephy")
-  (c-name "EphyEmbedContainer")
-  (gtype-id "EPHY_TYPE_EMBED_CONTAINER")
-)
-
-(define-interface Embed
-  (in-module "Ephy")
-  (c-name "EphyEmbed")
-  (gtype-id "EPHY_TYPE_EMBED")
-)
-
-(define-interface EmbedEvent
-  (in-module "Ephy")
-  (c-name "EphyEmbedEvent")
-  (gtype-id "EPHY_TYPE_EMBED_EVENT")
-)
-
-(define-object EmbedPersist
-  (in-module "Ephy")
-  (parent "GObject")
-  (c-name "EphyEmbedPersist")
-  (gtype-id "EPHY_TYPE_EMBED_PERSIST")
-)
-
-(define-object EmbedShell
-  (in-module "Ephy")
-  (parent "GObject")
-  (c-name "EphyEmbedShell")
-  (gtype-id "EPHY_TYPE_EMBED_SHELL")
-)
-
-(define-interface EmbedSingle
-  (in-module "Ephy")
-  (c-name "EphyEmbedSingle")
-  (gtype-id "EPHY_TYPE_EMBED_SINGLE")
-)
-
-(define-interface Extension
-  (in-module "Ephy")
-  (c-name "EphyExtension")
-  (gtype-id "EPHY_TYPE_EXTENSION")
-)
-
-(define-object ExtensionsManager
-  (in-module "Ephy")
-  (parent "GObject")
-  (c-name "EphyExtensionsManager")
-  (gtype-id "EPHY_TYPE_EXTENSIONS_MANAGER")
-)
-
-(define-object FaviconCache
-  (in-module "Ephy")
-  (parent "GObject")
-  (c-name "EphyFaviconCache")
-  (gtype-id "EPHY_TYPE_FAVICON_CACHE")
-)
-
-(define-object FindToolbar
-  (in-module "Ephy")
-  (parent "GtkToolbar")
-  (c-name "EphyFindToolbar")
-  (gtype-id "EPHY_TYPE_FIND_TOOLBAR")
-)
-
-(define-object History
-  (in-module "Ephy")
-  (parent "GObject")
-  (c-name "EphyHistory")
-  (gtype-id "EPHY_TYPE_HISTORY")
-)
-
-(define-interface Link
-  (in-module "Ephy")
-  (c-name "EphyLink")
-  (gtype-id "EPHY_TYPE_LINK")
-)
-
-(define-object LinkAction
-  (in-module "Ephy")
-  (parent "GtkAction")
-  (c-name "EphyLinkAction")
-  (gtype-id "EPHY_TYPE_LINK_ACTION")
-)
-
-(define-object LinkActionGroup
-  (in-module "Ephy")
-  (parent "GtkActionGroup")
-  (c-name "EphyLinkActionGroup")
-  (gtype-id "EPHY_TYPE_LINK_ACTION_GROUP")
-)
-
-(define-object LocationAction
-  (in-module "Ephy")
-  (parent "EphyLinkAction")
-  (c-name "EphyLocationAction")
-  (gtype-id "EPHY_TYPE_LOCATION_ACTION")
-)
-
-(define-object NodeDb
-  (in-module "Ephy")
-  (parent "GObject")
-  (c-name "EphyNodeDb")
-  (gtype-id "EPHY_TYPE_NODE_DB")
-)
-
-(define-object Notebook
-  (in-module "Ephy")
-  (parent "GtkNotebook")
-  (c-name "EphyNotebook")
-  (gtype-id "EPHY_TYPE_NOTEBOOK")
-)
-
-(define-interface PasswordManager
-  (in-module "Ephy")
-  (c-name "EphyPasswordManager")
-  (gtype-id "EPHY_TYPE_PASSWORD_MANAGER")
-)
-
-;; (define-interface PermissionManager
-;;   (in-module "Ephy")
-;;   (c-name "EphyPermissionManager")
-;;   (gtype-id "EPHY_TYPE_PERMISSION_MANAGER")
-;; )
-
-(define-object SearchEntry
-  (in-module "Ephy")
-  (parent "GtkEntry")
-  (c-name "EphySearchEntry")
-  (gtype-id "EPHY_TYPE_SEARCH_ENTRY")
-)
-
-(define-object Session
-  (in-module "Ephy")
-  (parent "GObject")
-  (c-name "EphySession")
-  (gtype-id "EPHY_TYPE_SESSION")
-)
-
-(define-object Shell
-  (in-module "Ephy")
-  (parent "EphyEmbedShell")
-  (c-name "EphyShell")
-  (gtype-id "EPHY_TYPE_SHELL")
-)
-
-(define-object Spinner
-  (in-module "Ephy")
-  (parent "GtkEventBox")
-  (c-name "EphySpinner")
-  (gtype-id "EPHY_TYPE_SPINNER")
-)
-
-(define-object Statusbar
-  (in-module "Ephy")
-  (parent "GtkStatusbar")
-  (c-name "EphyStatusbar")
-  (gtype-id "EPHY_TYPE_STATUSBAR")
-)
-
-(define-object Toolbar
-  (in-module "Ephy")
-  (parent "EggEditableToolbar")
-  (c-name "EphyToolbar")
-  (gtype-id "EPHY_TYPE_TOOLBAR")
-)
-
-(define-object EggToolbarsModel
-  (in-module "Egg")
-  (parent "GObject")
-  (c-name "EggToolbarsModel")
-  (gtype-id "EGG_TYPE_TOOLBARS_MODEL")
-)
-
-(define-object Window
-  (in-module "Ephy")
-  (parent "GtkWindow")
-  (c-name "EphyWindow")
-  (gtype-id "EPHY_TYPE_WINDOW")
-)
-
-;; Enumerations and flags ...
-
-(define-flags EmbedNavigationFlags
-  (in-module "Ephy")
-  (c-name "EphyEmbedNavigationFlags")
-  (gtype-id "EPHY_TYPE_EMBED_NAVIGATION_FLAGS")
-  (values
-    '("up" "EPHY_EMBED_NAV_UP")
-    '("back" "EPHY_EMBED_NAV_BACK")
-    '("forward" "EPHY_EMBED_NAV_FORWARD")
-  )
-)
-
-(define-flags EmbedEventContext
-  (in-module "Ephy")
-  (c-name "EphyEmbedEventContext")
-  (gtype-id "EPHY_TYPE_EMBED_EVENT_CONTEXT")
-  (values
-    '("none" "EPHY_EMBED_CONTEXT_NONE")
-    '("default" "EPHY_EMBED_CONTEXT_DEFAULT")
-    '("link" "EPHY_EMBED_CONTEXT_LINK")
-    '("image" "EPHY_EMBED_CONTEXT_IMAGE")
-    '("document" "EPHY_EMBED_CONTEXT_DOCUMENT")
-    '("input" "EPHY_EMBED_CONTEXT_INPUT")
-    '("input-password" "EPHY_EMBED_CONTEXT_INPUT_PASSWORD")
-    '("xul" "EPHY_EMBED_CONTEXT_XUL")
-    '("email-link" "EPHY_EMBED_CONTEXT_EMAIL_LINK")
-  )
-)
-
-(define-flags EmbedPersistFlags
-  (in-module "Ephy")
-  (c-name "EphyEmbedPersistFlags")
-  (gtype-id "EPHY_TYPE_EMBED_PERSIST_FLAGS")
-  (values
-    '("copy-page" "EPHY_EMBED_PERSIST_COPY_PAGE")
-    '("maindoc" "EPHY_EMBED_PERSIST_MAINDOC")
-    '("no-view" "EPHY_EMBED_PERSIST_NO_VIEW")
-    '("ask-destination" "EPHY_EMBED_PERSIST_ASK_DESTINATION")
-    '("do-conversion" "EPHY_EMBED_PERSIST_DO_CONVERSION")
-    '("from-cache" "EPHY_EMBED_PERSIST_FROM_CACHE")
-    '("no-certdialogs" "EPHY_EMBED_PERSIST_NO_CERTDIALOGS")
-  )
-)
-
-(define-flags EmbedNetState
-  (in-module "Ephy")
-  (c-name "EphyEmbedNetState")
-  (gtype-id "EPHY_TYPE_EMBED_NET_STATE")
-  (values
-    '("unknown" "EPHY_EMBED_STATE_UNKNOWN")
-    '("start" "EPHY_EMBED_STATE_START")
-    '("redirecting" "EPHY_EMBED_STATE_REDIRECTING")
-    '("transferring" "EPHY_EMBED_STATE_TRANSFERRING")
-    '("negotiating" "EPHY_EMBED_STATE_NEGOTIATING")
-    '("stop" "EPHY_EMBED_STATE_STOP")
-    '("is-request" "EPHY_EMBED_STATE_IS_REQUEST")
-    '("is-document" "EPHY_EMBED_STATE_IS_DOCUMENT")
-    '("is-network" "EPHY_EMBED_STATE_IS_NETWORK")
-    '("is-window" "EPHY_EMBED_STATE_IS_WINDOW")
-    '("restoring" "EPHY_EMBED_STATE_RESTORING")
-  )
-)
-
-(define-flags EmbedChrome
-  (in-module "Ephy")
-  (c-name "EphyEmbedChrome")
-  (gtype-id "EPHY_TYPE_EMBED_CHROME")
-  (values
-    '("menubar" "EPHY_EMBED_CHROME_MENUBAR")
-    '("toolbar" "EPHY_EMBED_CHROME_TOOLBAR")
-    '("statusbar" "EPHY_EMBED_CHROME_STATUSBAR")
-    '("bookmarksbar" "EPHY_EMBED_CHROME_BOOKMARKSBAR")
-  )
-)
-
-(define-enum EmbedPrintPreviewNavType
-  (in-module "Ephy")
-  (c-name "EphyEmbedPrintPreviewNavType")
-  (gtype-id "EPHY_TYPE_EMBED_PRINT_PREVIEW_NAV_TYPE")
-  (values
-    '("goto-pagenum" "EPHY_EMBED_PRINTPREVIEW_GOTO_PAGENUM")
-    '("prev-page" "EPHY_EMBED_PRINTPREVIEW_PREV_PAGE")
-    '("next-page" "EPHY_EMBED_PRINTPREVIEW_NEXT_PAGE")
-    '("home" "EPHY_EMBED_PRINTPREVIEW_HOME")
-    '("end" "EPHY_EMBED_PRINTPREVIEW_END")
-  )
-)
-
-(define-enum EmbedSecurityLevel
-  (in-module "Ephy")
-  (c-name "EphyEmbedSecurityLevel")
-  (gtype-id "EPHY_TYPE_EMBED_SECURITY_LEVEL")
-  (values
-    '("unknown" "EPHY_EMBED_STATE_IS_UNKNOWN")
-    '("insecure" "EPHY_EMBED_STATE_IS_INSECURE")
-    '("broken" "EPHY_EMBED_STATE_IS_BROKEN")
-    '("secure-low" "EPHY_EMBED_STATE_IS_SECURE_LOW")
-    '("secure-med" "EPHY_EMBED_STATE_IS_SECURE_MED")
-    '("secure-high" "EPHY_EMBED_STATE_IS_SECURE_HIGH")
-  )
-)
-
-(define-enum EmbedDocumentType
-  (in-module "Ephy")
-  (c-name "EphyEmbedDocumentType")
-  (gtype-id "EPHY_TYPE_EMBED_DOCUMENT_TYPE")
-  (values
-    '("html" "EPHY_EMBED_DOCUMENT_HTML")
-    '("xml" "EPHY_EMBED_DOCUMENT_XML")
-    '("image" "EPHY_EMBED_DOCUMENT_IMAGE")
-    '("other" "EPHY_EMBED_DOCUMENT_OTHER")
-  )
-)
-
-;; (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")
-  (c-name "EggTbModelFlags")
-  (gtype-id "EGG_TYPE_TB_MODEL_FLAGS")
-  (values
-    '("not-removable" "EGG_TB_MODEL_NOT_REMOVABLE")
-    '("both" "EGG_TB_MODEL_BOTH")
-    '("both-horiz" "EGG_TB_MODEL_BOTH_HORIZ")
-    '("icons" "EGG_TB_MODEL_ICONS")
-    '("text" "EGG_TB_MODEL_TEXT")
-    '("styles-mask" "EGG_TB_MODEL_STYLES_MASK")
-    '("accept-items-only" "EGG_TB_MODEL_ACCEPT_ITEMS_ONLY")
-    '("hidden" "EGG_TB_MODEL_HIDDEN")
-  )
-)
-
-;; (define-enum DialogApplyType
-;;   (in-module "Ephy")
-;;   (c-name "EphyDialogApplyType")
-;;   (gtype-id "EPHY_TYPE_DIALOG_APPLY_TYPE")
-;;   (values
-;;     '("normal" "PT_NORMAL")
-;;     '("autoapply" "PT_AUTOAPPLY")
-;;   )
-;; )
-
-(define-enum NodeSignalType
-  (in-module "Ephy")
-  (c-name "EphyNodeSignalType")
-  (gtype-id "EPHY_TYPE_NODE_SIGNAL_TYPE")
-  (values
-    '("destroy" "EPHY_NODE_DESTROY")
-    '("restored" "EPHY_NODE_RESTORED")
-    '("changed" "EPHY_NODE_CHANGED")
-    '("child-added" "EPHY_NODE_CHILD_ADDED")
-    '("child-changed" "EPHY_NODE_CHILD_CHANGED")
-    '("child-removed" "EPHY_NODE_CHILD_REMOVED")
-    '("children-reordered" "EPHY_NODE_CHILDREN_REORDERED")
-  )
-)
-
-(define-flags StateWindowFlags
-  (in-module "Ephy")
-  (c-name "EphyStateWindowFlags")
-  (gtype-id "EPHY_TYPE_STATE_WINDOW_FLAGS")
-  (values
-    '("none" "EPHY_STATE_WINDOW_SAVE_NONE")
-    '("size" "EPHY_STATE_WINDOW_SAVE_SIZE")
-    '("position" "EPHY_STATE_WINDOW_SAVE_POSITION")
-  )
-)
-
-(define-enum BookmarkProperty
-  (in-module "Ephy")
-  (c-name "EphyBookmarkProperty")
-  (gtype-id "EPHY_TYPE_BOOKMARK_PROPERTY")
-  (values
-    '("bmk-prop-title" "EPHY_NODE_BMK_PROP_TITLE")
-    '("bmk-prop-location" "EPHY_NODE_BMK_PROP_LOCATION")
-    '("bmk-prop-keywords" "EPHY_NODE_BMK_PROP_KEYWORDS")
-    '("keyword-prop-name" "EPHY_NODE_KEYWORD_PROP_NAME")
-    '("bmk-prop-icon" "EPHY_NODE_BMK_PROP_ICON")
-    '("keyword-prop-priority" "EPHY_NODE_KEYWORD_PROP_PRIORITY")
-    '("bmk-prop-immutable" "EPHY_NODE_BMK_PROP_IMMUTABLE")
-  )
-)
-
-(define-flags LinkFlags
-  (in-module "Ephy")
-  (c-name "EphyLinkFlags")
-  (gtype-id "EPHY_TYPE_LINK_FLAGS")
-  (values
-    '("new-window" "EPHY_LINK_NEW_WINDOW")
-    '("new-tab" "EPHY_LINK_NEW_TAB")
-    '("jump-to" "EPHY_LINK_JUMP_TO")
-  )
-)
-
-(define-flags NewTabFlags
-  (in-module "Ephy")
-  (c-name "EphyNewTabFlags")
-  (gtype-id "EPHY_TYPE_NEW_TAB_FLAGS")
-  (values
-    '("home-page" "EPHY_NEW_TAB_HOME_PAGE")
-    '("new-page" "EPHY_NEW_TAB_NEW_PAGE")
-    '("open-page" "EPHY_NEW_TAB_OPEN_PAGE")
-    '("fullscreen-mode" "EPHY_NEW_TAB_FULLSCREEN_MODE")
-    '("dont-show-window" "EPHY_NEW_TAB_DONT_SHOW_WINDOW")
-    '("append-last" "EPHY_NEW_TAB_APPEND_LAST")
-    '("append-after" "EPHY_NEW_TAB_APPEND_AFTER")
-    '("jump" "EPHY_NEW_TAB_JUMP")
-    '("in-new-window" "EPHY_NEW_TAB_IN_NEW_WINDOW")
-    '("in-existing-window" "EPHY_NEW_TAB_IN_EXISTING_WINDOW")
-  )
-)
-
-(define-enum EmbedAddressExpire
-  (in-module "Ephy")
-  (c-name "EphyEmbedAddressExpire")
-  (gtype-id "EPHY_TYPE_EMBED_ADDRESS_EXPIRE")
-  (values
-    '("now" "EPHY_EMBED_ADDRESS_EXPIRE_NOW")
-    '("next" "EPHY_EMBED_ADDRESS_EXPIRE_NEXT")
-    '("current" "EPHY_EMBED_ADDRESS_EXPIRE_CURRENT")
-  )
-)
-
-
-;; From ../embed/ephy-command-manager.h
-
-(define-function ephy_command_manager_get_type
-  (c-name "ephy_command_manager_get_type")
-  (return-type "GType")
-)
-
-(define-method do_command
-  (of-object "EphyCommandManager")
-  (c-name "ephy_command_manager_do_command")
-  (return-type "none")
-  (parameters
-    '("const-char*" "command")
-  )
-)
-
-(define-method can_do_command
-  (of-object "EphyCommandManager")
-  (c-name "ephy_command_manager_can_do_command")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "command")
-  )
-)
-
-
-
-;; From ../../embed/ephy-embed-container.h
-
-(define-method set_active_child
-  (of-object "EphyEmbedContainer")
-  (c-name "ephy_embed_container_set_active_child")
-  (return-type "none")
-  (parameters
-    '("EphyEmbed*" "child")
-  )
-)
-
-(define-method get_active_child
-  (of-object "EphyEmbedContainer")
-  (c-name "ephy_embed_container_get_active_child")
-  (return-type "EphyEmbed*")
-)
-
-(define-method get_childs
-  (of-object "EphyEmbedContainer")
-  (c-name "ephy_embed_container_get_childs")
-  (return-type "GList*")
-)
-
-(define-method get_is_popup
-  (of-object "EphyEmbedContainer")
-  (c-name "ephy_embed_container_get_is_popup")
-  (return-type "gboolean")
-)
-
-(define-method get_chrome
-  (of-object "EphyEmbedContainer")
-  (c-name "ephy_embed_container_get_chrome")
-  (return-type "EphyEmbedChrome")
-)
-
-;; From ../../embed/ephy-embed-event.h
-
-(define-function ephy_embed_event_get_type
-  (c-name "ephy_embed_event_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_event_context_get_type
-  (c-name "ephy_embed_event_context_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_event_type_get_type
-  (c-name "ephy_embed_event_type_get_type")
-  (return-type "GType")
-)
-
-(define-method get_context
-  (of-object "EphyEmbedEvent")
-  (c-name "ephy_embed_event_get_context")
-  (return-type "EphyEmbedEventContext")
-)
-
-(define-method get_button
-  (of-object "EphyEmbedEvent")
-  (c-name "ephy_embed_event_get_button")
-  (return-type "guint")
-)
-
-(define-method get_modifier
-  (of-object "EphyEmbedEvent")
-  (c-name "ephy_embed_event_get_modifier")
-  (return-type "guint")
-)
-
-(define-method get_coords
-  (of-object "EphyEmbedEvent")
-  (c-name "ephy_embed_event_get_coords")
-  (return-type "none")
-  (parameters
-    '("guint*" "x")
-    '("guint*" "y")
-  )
-)
-
-(define-method get_event_property
-  (of-object "EphyEmbedEvent")
-  (c-name "ephy_embed_event_get_property")
-  (return-type "const-GValue*")
-  (parameters
-    '("const-char*" "name")
-  )
-)
-
-(define-method has_event_property
-  (of-object "EphyEmbedEvent")
-  (c-name "ephy_embed_event_has_property")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "name")
-  )
-)
-
-
-; Not very useful for python!
-;(define-method get_dom_event
-;  (of-object "EphyEmbedEvent")
-;  (c-name "ephy_embed_event_get_dom_event")
-;  (return-type "gpointer")
-;)
-
-
-;; From ../embed/ephy-embed-factory.h
-
-(define-function ephy_embed_factory_new_object
-  (c-name "ephy_embed_factory_new_object")
-  (return-type "GObject*")
-  (parameters
-    '("GType" "type")
-  )
-)
-
-
-
-;; From ../../embed/ephy-embed-persist.h
-
-(define-function ephy_embed_persist_flags_get_type
-  (c-name "ephy_embed_persist_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_persist_get_type
-  (c-name "ephy_embed_persist_get_type")
-  (return-type "GType")
-)
-
-(define-method save
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_save")
-  (return-type "gboolean")
-)
-
-(define-method cancel
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_cancel")
-  (return-type "none")
-)
-
-(define-method set_dest
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_set_dest")
-  (return-type "none")
-  (parameters
-    '("const-char*" "value")
-  )
-)
-
-(define-method set_embed
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_set_embed")
-  (return-type "none")
-  (parameters
-    '("EphyEmbed*" "value")
-  )
-)
-
-(define-method set_fc_title
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_set_fc_title")
-  (return-type "none")
-  (parameters
-    '("const-char*" "value")
-  )
-)
-
-(define-method set_fc_parent
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_set_fc_parent")
-  (return-type "none")
-  (parameters
-    '("GtkWindow*" "value")
-  )
-)
-
-(define-method set_flags
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_set_flags")
-  (return-type "none")
-  (parameters
-    '("EphyEmbedPersistFlags" "value")
-  )
-)
-
-(define-method set_max_size
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_set_max_size")
-  (return-type "none")
-  (parameters
-    '("gint64" "value")
-  )
-)
-
-(define-method set_persist_key
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_set_persist_key")
-  (return-type "none")
-  (parameters
-    '("const-char*" "value")
-  )
-)
-
-(define-method set_source
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_set_source")
-  (return-type "none")
-  (parameters
-    '("const-char*" "value")
-  )
-)
-
-(define-method set_user_time
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_set_user_time")
-  (return-type "none")
-  (parameters
-    '("guint32" "user_time")
-  )
-)
-
-(define-method get_dest
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_get_dest")
-  (return-type "const-char*")
-)
-
-(define-method get_embed
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_get_embed")
-  (return-type "EphyEmbed*")
-)
-
-(define-method get_fc_title
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_get_fc_title")
-  (return-type "const-char*")
-)
-
-(define-method get_fc_parent
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_get_fc_parent")
-  (return-type "GtkWindow*")
-)
-
-(define-method get_flags
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_get_flags")
-  (return-type "EphyEmbedPersistFlags")
-)
-
-(define-method get_max_size
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_get_max_size")
-  (return-type "gint64")
-)
-
-(define-method get_persist_key
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_get_persist_key")
-  (return-type "const-char*")
-)
-
-(define-method get_source
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_get_source")
-  (return-type "const-char*")
-)
-
-(define-method get_user_time
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_get_user_time")
-  (return-type "guint32")
-)
-
-(define-method to_string
-  (of-object "EphyEmbedPersist")
-  (c-name "ephy_embed_persist_to_string")
-  (return-type "char*")
-)
-
-
-
-;; From ../../embed/ephy-embed-shell.h
-
-(define-function ephy_embed_shell_get_type
-  (c-name "ephy_embed_shell_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_shell_get_default
-  (c-name "ephy_embed_shell_get_default")
-  (return-type "EphyEmbedShell*")
-)
-
-(define-method get_favicon_cache
-  (of-object "EphyEmbedShell")
-  (c-name "ephy_embed_shell_get_favicon_cache")
-  (return-type "GObject*")
-)
-
-(define-method get_global_history
-  (of-object "EphyEmbedShell")
-  (c-name "ephy_embed_shell_get_global_history")
-  (return-type "GObject*")
-)
-
-(define-method get_downloader_view
-  (of-object "EphyEmbedShell")
-  (c-name "ephy_embed_shell_get_downloader_view")
-  (return-type "GObject*")
-)
-
-(define-method get_encodings
-  (of-object "EphyEmbedShell")
-  (c-name "ephy_embed_shell_get_encodings")
-  (return-type "GObject*")
-)
-
-(define-method get_embed_single
-  (of-object "EphyEmbedShell")
-  (c-name "ephy_embed_shell_get_embed_single")
-  (return-type "GObject*")
-)
-
-(define-method prepare_close
-  (of-object "EphyEmbedShell")
-  (c-name "ephy_embed_shell_prepare_close")
-  (return-type "none")
-)
-
-
-
-;; From ../../embed/ephy-embed-single.h
-
-(define-function ephy_embed_single_get_type
-  (c-name "ephy_embed_single_get_type")
-  (return-type "GType")
-)
-
-(define-method open_window
-  (of-object "EphyEmbedSingle")
-  (c-name "ephy_embed_single_open_window")
-  (return-type "GtkWidget*")
-  (parameters
-    '("EphyEmbed*" "parent")
-    '("const-char*" "address")
-    '("const-char*" "name")
-    '("const-char*" "features")
-  )
-)
-
-(define-method clear_cache
-  (of-object "EphyEmbedSingle")
-  (c-name "ephy_embed_single_clear_cache")
-  (return-type "none")
-)
-
-(define-method clear_auth_cache
-  (of-object "EphyEmbedSingle")
-  (c-name "ephy_embed_single_clear_auth_cache")
-  (return-type "none")
-)
-
-(define-method set_network_status
-  (of-object "EphyEmbedSingle")
-  (c-name "ephy_embed_single_set_network_status")
-  (return-type "none")
-  (parameters
-    '("gboolean" "offline")
-  )
-)
-
-(define-method get_network_status
-  (of-object "EphyEmbedSingle")
-  (c-name "ephy_embed_single_get_network_status")
-  (return-type "gboolean")
-)
-
-(define-method get_font_list
-  (of-object "EphyEmbedSingle")
-  (c-name "ephy_embed_single_get_font_list")
-  (return-type "GList*")
-  (parameters
-    '("const-char*" "lang_group")
-  )
-)
-
-;; From ../embed/ephy-embed-type-builtins.h
-
-(define-function ephy_embed_net_state_get_type
-  (c-name "ephy_embed_net_state_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_chrome_get_type
-  (c-name "ephy_embed_chrome_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_print_preview_nav_type_get_type
-  (c-name "ephy_embed_print_preview_nav_type_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_security_level_get_type
-  (c-name "ephy_embed_security_level_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_document_type_get_type
-  (c-name "ephy_embed_document_type_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_event_context_get_type
-  (c-name "ephy_embed_event_context_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_persist_flags_get_type
-  (c-name "ephy_embed_persist_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_content_check_type_get_type
-  (c-name "ephy_content_check_type_get_type")
-  (return-type "GType")
-)
-
-;; (define-function ephy_permission_get_type
-;;   (c-name "ephy_permission_get_type")
-;;   (return-type "GType")
-;; )
-
-
-
-;; From ../embed/ephy-embed.h
-
-(define-function ephy_embed_navigation_flags_get_type
-  (c-name "ephy_embed_navigation_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_address_expire_get_type
-  (c-name "ephy_embed_address_expire_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_net_state_get_type
-  (c-name "ephy_embed_net_state_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_chrome_get_type
-  (c-name "ephy_embed_chrome_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_ppv_navigation_get_type
-  (c-name "ephy_embed_ppv_navigation_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_security_level_get_type
-  (c-name "ephy_embed_security_level_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_document_type_get_type
-  (c-name "ephy_embed_document_type_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_embed_get_type
-  (c-name "ephy_embed_get_type")
-  (return-type "GType")
-)
-
-(define-method get_title
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_title")
-  (return-type "const-char*")
-)
-
-(define-method get_location
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_location")
-  (return-type "char*")
-  (parameters
-    '("gboolean" "toplevel")
-  )
-)
-
-(define-method get_link_message
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_link_message")
-  (return-type "const-char*")
-)
-
-(define-method get_js_status
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_js_status")
-  (return-type "char*")
-)
-
-(define-method get_go_up_list
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_go_up_list")
-  (return-type "GSList*")
-)
-
-(define-method get_security_level
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_security_level")
-  (return-type "none")
-  (parameters
-    '("EphyEmbedSecurityLevel*" "level")
-    '("char**" "description")
-  )
-)
-
-(define-method get_document_type
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_document_type")
-  (return-type "EphyEmbedDocumentType")
-)
-
-(define-method get_load_percent
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_load_percent")
-  (return-type "int")
-)
-
-(define-method get_load_status
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_load_status")
-  (return-type "gboolean")
-)
-
-(define-method get_navigation_flags
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_navigation_flags")
-  (return-type "EphyEmbedNavigationFlags")
-)
-
-(define-method get_typed_address
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_typed_address")
-  (return-type "const-char*")
-)
-
-(define-method get_address
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_address")
-  (return-type "const-char*")
-)
-
-(define-method get_status_message
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_status_message")
-  (return-type "const-char*")
-)
-
-(define-method get_icon
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_icon")
-  (return-type "GdkPixbuf*")
-)
-
-(define-method get_icon_address
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_icon_address")
-  (return-type "const-char*")
-)
-
-(define-method get_is_blank
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_is_blank")
-  (return-type "gboolean")
-)
-
-(define-method get_loading_title
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_loading_title")
-  (return-type "const-char*")
-)
-
-(define-method can_go_up
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_can_go_up")
-  (return-type "gboolean")
-)
-
-(define-method go_up
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_go_up")
-  (return-type "none")
-)
-
-(define-method show_page_certificate
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_show_page_certificate")
-  (return-type "none")
-)
-
-(define-method set_print_preview_mode
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_set_print_preview_mode")
-  (return-type "none")
-  (parameters
-    '("gboolean" "preview_mode")
-  )
-)
-
-(define-method print_preview_n_pages
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_print_preview_n_pages")
-  (return-type "int")
-)
-
-(define-method print_preview_navigate
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_print_preview_navigate")
-  (return-type "none")
-  (parameters
-    '("EphyEmbedPrintPreviewNavType" "type")
-    '("int" "page")
-  )
-)
-
-(define-method has_modified_forms
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_has_modified_forms")
-  (return-type "gboolean")
-)
-
-
-
-;; From ../../embed/ephy-favicon-cache.h
-
-(define-function ephy_favicon_cache_get_type
-  (c-name "ephy_favicon_cache_get_type")
-  (return-type "GType")
-)
-
-; Don't allow creation of another favicon cache
-;(define-function ephy_favicon_cache_new
-;  (c-name "ephy_favicon_cache_new")
-;  (is-constructor-of "EphyFaviconCache")
-;  (return-type "EphyFaviconCache*")
-;)
-
-(define-method get
-  (of-object "EphyFaviconCache")
-  (c-name "ephy_favicon_cache_get")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-char*" "url")
-  )
-)
-
-(define-method clear
-  (of-object "EphyFaviconCache")
-  (c-name "ephy_favicon_cache_clear")
-  (return-type "none")
-)
-
-
-;; From ephy-find-toolbar.h
-
-(define-function ephy_find_toolbar_get_type
-  (c-name "ephy_find_toolbar_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_find_toolbar_new
-  (c-name "ephy_find_toolbar_new")
-  (is-constructor-of "EphyFindToolbar")
-  (return-type "EphyFindToolbar*")
-  (parameters
-    '("EphyWindow*" "window")
-  )
-)
-
-(define-method get_text
-  (of-object "EphyFindToolbar")
-  (c-name "ephy_find_toolbar_get_text")
-  (return-type "const-char*")
-)
-
-(define-method set_embed
-  (of-object "EphyFindToolbar")
-  (c-name "ephy_find_toolbar_set_embed")
-  (return-type "none")
-  (parameters
-    '("EphyEmbed*" "embed")
-  )
-)
-
-(define-method find_next
-  (of-object "EphyFindToolbar")
-  (c-name "ephy_find_toolbar_find_next")
-  (return-type "none")
-)
-
-(define-method find_previous
-  (of-object "EphyFindToolbar")
-  (c-name "ephy_find_toolbar_find_previous")
-  (return-type "none")
-)
-
-(define-method open
-  (of-object "EphyFindToolbar")
-  (c-name "ephy_find_toolbar_open")
-  (return-type "none")
-  (parameters
-    '("gboolean" "links_only")
-    '("gboolean" "clear_search")
-  )
-)
-
-(define-method close
-  (of-object "EphyFindToolbar")
-  (c-name "ephy_find_toolbar_close")
-  (return-type "none")
-)
-
-(define-method request_close
-  (of-object "EphyFindToolbar")
-  (c-name "ephy_find_toolbar_request_close")
-  (return-type "none")
-)
-
-
-;; From ../../embed/ephy-history.h
-
-(define-function ephy_history_get_type
-  (c-name "ephy_history_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_history_new
-  (c-name "ephy_history_new")
-  (is-constructor-of "EphyHistory")
-  (return-type "EphyHistory*")
-)
-
-(define-method get_hosts
-  (of-object "EphyHistory")
-  (c-name "ephy_history_get_hosts")
-  (return-type "EphyNode*")
-)
-
-(define-method get_host
-  (of-object "EphyHistory")
-  (c-name "ephy_history_get_host")
-  (return-type "EphyNode*")
-  (parameters
-    '("const-char*" "url")
-  )
-)
-
-(define-method get_pages
-  (of-object "EphyHistory")
-  (c-name "ephy_history_get_pages")
-  (return-type "EphyNode*")
-)
-
-(define-method get_page
-  (of-object "EphyHistory")
-  (c-name "ephy_history_get_page")
-  (return-type "EphyNode*")
-  (parameters
-    '("const-char*" "url")
-  )
-)
-
-(define-method add_page
-  (of-object "EphyHistory")
-  (c-name "ephy_history_add_page")
-  (return-type "none")
-  (parameters
-    '("const-char*" "url")
-    '("gboolean" "redirect")
-    '("gboolean" "toplevel")
-  )
-)
-
-(define-method is_page_visited
-  (of-object "EphyHistory")
-  (c-name "ephy_history_is_page_visited")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "url")
-  )
-)
-
-(define-method get_page_visits
-  (of-object "EphyHistory")
-  (c-name "ephy_history_get_page_visits")
-  (return-type "int")
-  (parameters
-    '("const-char*" "url")
-  )
-)
-
-(define-method set_page_title
-  (of-object "EphyHistory")
-  (c-name "ephy_history_set_page_title")
-  (return-type "none")
-  (parameters
-    '("const-char*" "url")
-    '("const-char*" "title")
-  )
-)
-
-(define-method get_last_page
-  (of-object "EphyHistory")
-  (c-name "ephy_history_get_last_page")
-  (return-type "const-char*")
-)
-
-(define-method set_icon
-  (of-object "EphyHistory")
-  (c-name "ephy_history_set_icon")
-  (return-type "none")
-  (parameters
-    '("const-char*" "url")
-    '("const-char*" "icon")
-  )
-)
-
-(define-method get_icon
-  (of-object "EphyHistory")
-  (c-name "ephy_history_get_icon")
-  (return-type "const-char*")
-  (parameters
-    '("const-char*" "url")
-  )
-)
-
-(define-method clear
-  (of-object "EphyHistory")
-  (c-name "ephy_history_clear")
-  (return-type "none")
-)
-
-(define-method is_enabled
-  (of-object "EphyHistory")
-  (c-name "ephy_history_is_enabled")
-  (return-type "gboolean")
-)
-
-
-
-;; From ../../embed/ephy-password-manager.h
-
-(define-function ephy_password_info_get_type
-  (c-name "ephy_password_info_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_password_info_new
-  (c-name "ephy_password_info_new")
-  (is-constructor-of "EphyPasswordInfo")
-  (return-type "EphyPasswordInfo*")
-  (parameters
-    '("const-char*" "host")
-    '("const-char*" "username")
-    '("const-char*" "password")
-  )
-)
-
-(define-method copy
-  (of-object "EphyPasswordInfo")
-  (c-name "ephy_password_info_copy")
-  (return-type "EphyPasswordInfo*")
-)
-
-(define-method free
-  (of-object "EphyPasswordInfo")
-  (c-name "ephy_password_info_free")
-  (return-type "none")
-)
-
-(define-function ephy_password_manager_get_type
-  (c-name "ephy_password_manager_get_type")
-  (return-type "GType")
-)
-
-(define-method add_password
-  (of-object "EphyPasswordManager")
-  (c-name "ephy_password_manager_add_password")
-  (return-type "none")
-  (parameters
-    '("EphyPasswordInfo*" "info")
-  )
-)
-
-(define-method remove_password
-  (of-object "EphyPasswordManager")
-  (c-name "ephy_password_manager_remove_password")
-  (return-type "none")
-  (parameters
-    '("EphyPasswordInfo*" "info")
-  )
-)
-
-(define-method list_passwords
-  (of-object "EphyPasswordManager")
-  (c-name "ephy_password_manager_list_passwords")
-  (return-type "GList*")
-)
-
-
-
-;; 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")
-;;   )
-;; )
-;; 
-
-
-;; From ../../lib/egg/egg-editable-toolbar.h
-
-(define-function egg_editable_toolbar_get_type
-  (c-name "egg_editable_toolbar_get_type")
-  (return-type "GType")
-)
-
-; Don't allow creation of another toolbar
-;(define-function egg_editable_toolbar_new
-;  (c-name "egg_editable_toolbar_new")
-;  (is-constructor-of "EggEditableToolbar")
-;  (return-type "GtkWidget*")
-;  (parameters
-;    '("GtkUIManager*" "manager")
-;  )
-;)
-
-; Don't allow creation of another toolbar
-;(define-function egg_editable_toolbar_new_with_model
-;  (c-name "egg_editable_toolbar_new_with_model")
-;  (return-type "GtkWidget*")
-;  (parameters
-;    '("GtkUIManager*" "manager")
-;    '("EggToolbarsModel*" "model")
-;  )
-;)
-
-(define-method set_model
-  (of-object "EggEditableToolbar")
-  (c-name "egg_editable_toolbar_set_model")
-  (return-type "none")
-  (parameters
-    '("EggToolbarsModel*" "model")
-  )
-)
-
-(define-method get_model
-  (of-object "EggEditableToolbar")
-  (c-name "egg_editable_toolbar_get_model")
-  (return-type "EggToolbarsModel*")
-)
-
-(define-method set_edit_mode
-  (of-object "EggEditableToolbar")
-  (c-name "egg_editable_toolbar_set_edit_mode")
-  (return-type "none")
-  (parameters
-    '("gboolean" "mode")
-  )
-)
-
-(define-method get_edit_mode
-  (of-object "EggEditableToolbar")
-  (c-name "egg_editable_toolbar_get_edit_mode")
-  (return-type "gboolean")
-)
-
-(define-method show
-  (of-object "EggEditableToolbar")
-  (c-name "egg_editable_toolbar_show")
-  (return-type "none")
-  (parameters
-    '("const-char*" "name")
-  )
-)
-
-(define-method hide
-  (of-object "EggEditableToolbar")
-  (c-name "egg_editable_toolbar_hide")
-  (return-type "none")
-  (parameters
-    '("const-char*" "name")
-  )
-)
-
-(define-method set_drag_dest
-  (of-object "EggEditableToolbar")
-  (c-name "egg_editable_toolbar_set_drag_dest")
-  (return-type "none")
-  (parameters
-    '("const-GtkTargetEntry*" "targets")
-    '("gint" "n_targets")
-    '("const-char*" "toolbar_name")
-  )
-)
-
-(define-method set_fixed
-  (of-object "EggEditableToolbar")
-  (c-name "egg_editable_toolbar_set_fixed")
-  (return-type "none")
-  (parameters
-    '("GtkToolbar*" "fixed_toolbar")
-  )
-)
-
-
-
-;; From ../../lib/egg/egg-toolbars-model.h
-
-(define-function egg_toolbars_model_flags_get_type
-  (c-name "egg_toolbars_model_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function egg_toolbars_model_get_type
-  (c-name "egg_toolbars_model_get_type")
-  (return-type "GType")
-)
-
-; Don't allow creation of another toolbar
-;(define-function egg_toolbars_model_new
-;  (c-name "egg_toolbars_model_new")
-;  (is-constructor-of "EggToolbarsModel")
-;  (return-type "EggToolbarsModel*")
-;)
-
-(define-method load_names
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_load_names")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "xml_file")
-  )
-)
-
-(define-method load_toolbars
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_load_toolbars")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "xml_file")
-  )
-)
-
-(define-method save_toolbars
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_save_toolbars")
-  (return-type "none")
-  (parameters
-    '("const-char*" "xml_file")
-    '("const-char*" "version")
-  )
-)
-
-(define-method get_types
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_get_types")
-  (return-type "GList*")
-)
-
-(define-method set_types
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_set_types")
-  (return-type "none")
-  (parameters
-    '("GList*" "types")
-  )
-)
-
-; I can't get the GdkAtom compiling
-;(define-method get_name
-;  (of-object "EggToolbarsModel")
-;  (c-name "egg_toolbars_model_get_name")
-;  (return-type "char*")
-;  (parameters
-;    '("GdkAtom" "type")
-;    '("const-char*" "data")
-;    '("gboolean" "create")
-;  )
-;)
-
-; I can't get the GdkAtom compiling
-;(define-method get_data
-;  (of-object "EggToolbarsModel")
-;  (c-name "egg_toolbars_model_get_data")
-;  (return-type "char*")
-;  (parameters
-;    '("GdkAtom" "type")
-;    '("const-char*" "name")
-;  )
-;)
-
-(define-method get_name_avail
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_get_name_avail")
-  (return-type "GPtrArray*")
-)
-
-(define-method get_name_flags
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_get_name_flags")
-  (return-type "gint")
-  (parameters
-    '("const-char*" "name")
-  )
-)
-
-(define-method set_name_flags
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_set_name_flags")
-  (return-type "none")
-  (parameters
-    '("const-char*" "name")
-    '("gint" "count")
-  )
-)
-
-(define-method get_flags
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_get_flags")
-  (return-type "EggTbModelFlags")
-  (parameters
-    '("int" "toolbar_position")
-  )
-)
-
-(define-method set_flags
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_set_flags")
-  (return-type "none")
-  (parameters
-    '("int" "toolbar_position")
-    '("EggTbModelFlags" "flags")
-  )
-)
-
-(define-method add_toolbar
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_add_toolbar")
-  (return-type "int")
-  (parameters
-    '("int" "position")
-    '("const-char*" "name")
-  )
-)
-
-(define-method remove_toolbar
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_remove_toolbar")
-  (return-type "none")
-  (parameters
-    '("int" "position")
-  )
-)
-
-(define-method add_item
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_add_item")
-  (return-type "gboolean")
-  (parameters
-    '("int" "toolbar_position")
-    '("int" "position")
-    '("const-char*" "name")
-  )
-)
-
-(define-method remove_item
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_remove_item")
-  (return-type "none")
-  (parameters
-    '("int" "toolbar_position")
-    '("int" "position")
-  )
-)
-
-(define-method move_item
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_move_item")
-  (return-type "none")
-  (parameters
-    '("int" "toolbar_position")
-    '("int" "position")
-    '("int" "new_toolbar_position")
-    '("int" "new_position")
-  )
-)
-
-(define-method n_items
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_n_items")
-  (return-type "int")
-  (parameters
-    '("int" "toolbar_position")
-  )
-)
-
-(define-method item_nth
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_item_nth")
-  (return-type "const-char*")
-  (parameters
-    '("int" "toolbar_position")
-    '("int" "position")
-  )
-)
-
-(define-method n_toolbars
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_n_toolbars")
-  (return-type "int")
-)
-
-(define-method toolbar_nth
-  (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_toolbar_nth")
-  (return-type "const-char*")
-  (parameters
-    '("int" "position")
-  )
-)
-
-
-
-;; From ../lib/egg/eggtypebuiltins.h
-
-(define-function egg_tb_model_flags_get_type
-  (c-name "egg_tb_model_flags_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From ../lib/ephy-dialog.h
-
-(define-function ephy_dialog_get_type
-  (c-name "ephy_dialog_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_dialog_new
-  (c-name "ephy_dialog_new")
-  (is-constructor-of "EphyDialog")
-  (return-type "EphyDialog*")
-)
-
-(define-function ephy_dialog_new_with_parent
-  (c-name "ephy_dialog_new_with_parent")
-  (is-constructor-of "EphyDialog")
-  (return-type "EphyDialog*")
-  (parameters
-    '("GtkWidget*" "parent_window")
-  )
-)
-
-(define-method construct
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_construct")
-  (return-type "none")
-  (parameters
-    '("const-EphyDialogProperty*" "properties")
-    '("const-char*" "file")
-    '("const-char*" "name")
-    '("const-char*" "domain")
-  )
-)
-
-(define-method add_enum
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_add_enum")
-  (return-type "none")
-  (parameters
-    '("const-char*" "id")
-    '("guint" "n_items")
-    '("const-char*-const*" "items")
-  )
-)
-
-(define-method set_data_column
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_set_data_column")
-  (return-type "none")
-  (parameters
-    '("const-char*" "id")
-    '("int" "col")
-  )
-)
-
-(define-method set_size_group
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_set_size_group")
-  (return-type "none")
-  (parameters
-    '("const-char*" "first_id")
-  )
-  (varargs #t)
-)
-
-(define-method run
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_run")
-  (return-type "int")
-)
-
-(define-method show
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_show")
-  (return-type "none")
-)
-
-(define-method hide
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_hide")
-  (return-type "none")
-)
-
-(define-method set_parent
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_set_parent")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "parent")
-  )
-)
-
-(define-method get_parent
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_get_parent")
-  (return-type "GtkWidget*")
-)
-
-(define-method set_modal
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_set_modal")
-  (return-type "none")
-  (parameters
-    '("gboolean" "is_modal")
-  )
-)
-
-(define-method get_control
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_get_control")
-  (return-type "GtkWidget*")
-  (parameters
-    '("const-char*" "property_id")
-  )
-)
-
-(define-method get_controls
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_get_controls")
-  (return-type "none")
-  (parameters
-    '("const-char*" "first_property_id")
-  )
-  (varargs #t)
-)
-
-(define-method get_value
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_get_value")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "property_id")
-    '("GValue*" "value")
-  )
-)
-
-(define-method set_value
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_set_value")
-  (return-type "none")
-  (parameters
-    '("const-char*" "property_id")
-    '("const-GValue*" "value")
-  )
-)
-
-(define-method set_pref
-  (of-object "EphyDialog")
-  (c-name "ephy_dialog_set_pref")
-  (return-type "none")
-  (parameters
-    '("const-char*" "property_id")
-    '("const-char*" "pref")
-  )
-)
-
-
-
-;; From ../lib/ephy-lib-type-builtins.h
-
-(define-function ephy_dbus_bus_get_type
-  (c-name "ephy_dbus_bus_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_node_signal_type_get_type
-  (c-name "ephy_node_signal_type_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_state_window_flags_get_type
-  (c-name "ephy_state_window_flags_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From ../lib/ephy-node-db.h
-
-(define-function ephy_node_db_get_type
-  (c-name "ephy_node_db_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_node_db_new
-  (c-name "ephy_node_db_new")
-  (is-constructor-of "EphyNodeDb")
-  (return-type "EphyNodeDb*")
-  (parameters
-    '("const-char*" "name")
-  )
-)
-
-(define-method load_from_file
-  (of-object "EphyNodeDb")
-  (c-name "ephy_node_db_load_from_file")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "xml_file")
-    '("const-xmlChar*" "xml_root")
-    '("const-xmlChar*" "xml_version")
-  )
-)
-
-(define-method write_to_xml_safe
-  (of-object "EphyNodeDb")
-  (c-name "ephy_node_db_write_to_xml_safe")
-  (return-type "int")
-  (parameters
-    '("const-xmlChar*" "filename")
-    '("const-xmlChar*" "root")
-    '("const-xmlChar*" "version")
-    '("const-xmlChar*" "comment")
-    '("EphyNode*" "node")
-  )
-  (varargs #t)
-)
-
-(define-method get_name
-  (of-object "EphyNodeDb")
-  (c-name "ephy_node_db_get_name")
-  (return-type "const-char*")
-)
-
-(define-method is_immutable
-  (of-object "EphyNodeDb")
-  (c-name "ephy_node_db_is_immutable")
-  (return-type "gboolean")
-)
-
-(define-method set_immutable
-  (of-object "EphyNodeDb")
-  (c-name "ephy_node_db_set_immutable")
-  (return-type "none")
-  (parameters
-    '("gboolean" "immutable")
-  )
-)
-
-(define-method get_node_from_id
-  (of-object "EphyNodeDb")
-  (c-name "ephy_node_db_get_node_from_id")
-  (return-type "EphyNode*")
-  (parameters
-    '("guint" "id")
-  )
-)
-
-
-
-;; From ../../lib/ephy-node.h
-
-(define-function ephy_node_get_type
-  (c-name "ephy_node_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_node_new
-  (c-name "ephy_node_new")
-  (is-constructor-of "EphyNode")
-  (return-type "EphyNode*")
-  (parameters
-    '("EphyNodeDb*" "db")
-  )
-)
-
-(define-function ephy_node_new_with_id
-  (c-name "ephy_node_new_with_id")
-  (return-type "EphyNode*")
-  (parameters
-    '("EphyNodeDb*" "db")
-    '("guint" "reserved_id")
-  )
-)
-
-(define-method get_db
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_db")
-  (return-type "EphyNodeDb*")
-)
-
-(define-method get_id
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_id")
-  (return-type "guint")
-)
-
-(define-method ref
-  (of-object "EphyNode")
-  (c-name "ephy_node_ref")
-  (return-type "none")
-)
-
-(define-method unref
-  (of-object "EphyNode")
-  (c-name "ephy_node_unref")
-  (return-type "none")
-)
-
-(define-method signal_connect_object
-  (of-object "EphyNode")
-  (c-name "ephy_node_signal_connect_object")
-  (return-type "int")
-  (parameters
-    '("EphyNodeSignalType" "type")
-    '("EphyNodeCallback" "callback")
-    '("GObject*" "object")
-  )
-)
-
-(define-method signal_disconnect_object
-  (of-object "EphyNode")
-  (c-name "ephy_node_signal_disconnect_object")
-  (return-type "guint")
-  (parameters
-    '("EphyNodeSignalType" "type")
-    '("EphyNodeCallback" "callback")
-    '("GObject*" "object")
-  )
-)
-
-(define-method signal_disconnect
-  (of-object "EphyNode")
-  (c-name "ephy_node_signal_disconnect")
-  (return-type "none")
-  (parameters
-    '("int" "signal_id")
-  )
-)
-
-(define-method set_property
-  (of-object "EphyNode")
-  (c-name "ephy_node_set_property")
-  (return-type "none")
-  (parameters
-    '("guint" "property_id")
-    '("const-GValue*" "value")
-  )
-)
-
-(define-method get_property
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_property")
-  (return-type "gboolean")
-  (parameters
-    '("guint" "property_id")
-    '("GValue*" "value")
-  )
-)
-
-(define-method set_property_string
-  (of-object "EphyNode")
-  (c-name "ephy_node_set_property_string")
-  (return-type "none")
-  (parameters
-    '("guint" "property_id")
-    '("const-char*" "value")
-  )
-)
-
-(define-method get_property_string
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_property_string")
-  (return-type "const-char*")
-  (parameters
-    '("guint" "property_id")
-  )
-)
-
-(define-method set_property_boolean
-  (of-object "EphyNode")
-  (c-name "ephy_node_set_property_boolean")
-  (return-type "none")
-  (parameters
-    '("guint" "property_id")
-    '("gboolean" "value")
-  )
-)
-
-(define-method get_property_boolean
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_property_boolean")
-  (return-type "gboolean")
-  (parameters
-    '("guint" "property_id")
-  )
-)
-
-(define-method set_property_long
-  (of-object "EphyNode")
-  (c-name "ephy_node_set_property_long")
-  (return-type "none")
-  (parameters
-    '("guint" "property_id")
-    '("long" "value")
-  )
-)
-
-(define-method get_property_long
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_property_long")
-  (return-type "long")
-  (parameters
-    '("guint" "property_id")
-  )
-)
-
-(define-method set_property_int
-  (of-object "EphyNode")
-  (c-name "ephy_node_set_property_int")
-  (return-type "none")
-  (parameters
-    '("guint" "property_id")
-    '("int" "value")
-  )
-)
-
-(define-method get_property_int
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_property_int")
-  (return-type "int")
-  (parameters
-    '("guint" "property_id")
-  )
-)
-
-(define-method set_property_double
-  (of-object "EphyNode")
-  (c-name "ephy_node_set_property_double")
-  (return-type "none")
-  (parameters
-    '("guint" "property_id")
-    '("double" "value")
-  )
-)
-
-(define-method get_property_double
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_property_double")
-  (return-type "double")
-  (parameters
-    '("guint" "property_id")
-  )
-)
-
-(define-method set_property_float
-  (of-object "EphyNode")
-  (c-name "ephy_node_set_property_float")
-  (return-type "none")
-  (parameters
-    '("guint" "property_id")
-    '("float" "value")
-  )
-)
-
-(define-method get_property_float
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_property_float")
-  (return-type "float")
-  (parameters
-    '("guint" "property_id")
-  )
-)
-
-(define-method get_property_node
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_property_node")
-  (return-type "EphyNode*")
-  (parameters
-    '("guint" "property_id")
-  )
-)
-
-(define-method write_to_xml
-  (of-object "EphyNode")
-  (c-name "ephy_node_write_to_xml")
-  (return-type "int")
-  (parameters
-    '("xmlTextWriterPtr" "writer")
-  )
-)
-
-(define-function ephy_node_new_from_xml
-  (c-name "ephy_node_new_from_xml")
-  (return-type "EphyNode*")
-  (parameters
-    '("EphyNodeDb*" "db")
-    '("xmlNodePtr" "xml_node")
-  )
-)
-
-(define-method add_child
-  (of-object "EphyNode")
-  (c-name "ephy_node_add_child")
-  (return-type "none")
-  (parameters
-    '("EphyNode*" "child")
-  )
-)
-
-(define-method remove_child
-  (of-object "EphyNode")
-  (c-name "ephy_node_remove_child")
-  (return-type "none")
-  (parameters
-    '("EphyNode*" "child")
-  )
-)
-
-(define-method sort_children
-  (of-object "EphyNode")
-  (c-name "ephy_node_sort_children")
-  (return-type "none")
-  (parameters
-    '("GCompareFunc" "compare_func")
-  )
-)
-
-(define-method has_child
-  (of-object "EphyNode")
-  (c-name "ephy_node_has_child")
-  (return-type "gboolean")
-  (parameters
-    '("EphyNode*" "child")
-  )
-)
-
-(define-method reorder_children
-  (of-object "EphyNode")
-  (c-name "ephy_node_reorder_children")
-  (return-type "none")
-  (parameters
-    '("int*" "new_order")
-  )
-)
-
-(define-method get_children
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_children")
-  (return-type "GPtrArray*")
-)
-
-(define-method get_n_children
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_n_children")
-  (return-type "int")
-)
-
-(define-method get_nth_child
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_nth_child")
-  (return-type "EphyNode*")
-  (parameters
-    '("guint" "n")
-  )
-)
-
-(define-method get_child_index
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_child_index")
-  (return-type "int")
-  (parameters
-    '("EphyNode*" "child")
-  )
-)
-
-(define-method get_next_child
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_next_child")
-  (return-type "EphyNode*")
-  (parameters
-    '("EphyNode*" "child")
-  )
-)
-
-(define-method get_previous_child
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_previous_child")
-  (return-type "EphyNode*")
-  (parameters
-    '("EphyNode*" "child")
-  )
-)
-
-(define-method set_is_drag_source
-  (of-object "EphyNode")
-  (c-name "ephy_node_set_is_drag_source")
-  (return-type "none")
-  (parameters
-    '("gboolean" "allow")
-  )
-)
-
-(define-method get_is_drag_source
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_is_drag_source")
-  (return-type "gboolean")
-)
-
-(define-method set_is_drag_dest
-  (of-object "EphyNode")
-  (c-name "ephy_node_set_is_drag_dest")
-  (return-type "none")
-  (parameters
-    '("gboolean" "allow")
-  )
-)
-
-(define-method get_is_drag_dest
-  (of-object "EphyNode")
-  (c-name "ephy_node_get_is_drag_dest")
-  (return-type "gboolean")
-)
-
-
-
-;; From ../../lib/ephy-state.h
-
-(define-function ephy_state_add_window
-  (c-name "ephy_state_add_window")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "window")
-    '("const-char*" "name")
-    '("int" "default_width")
-    '("int" "default_heigth")
-    '("gboolean" "maximize")
-    '("EphyStateWindowFlags" "flags")
-  )
-)
-
-(define-function ephy_state_add_paned
-  (c-name "ephy_state_add_paned")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "paned")
-    '("const-char*" "name")
-    '("int" "default_width")
-  )
-)
-
-(define-function ephy_state_add_expander
-  (c-name "ephy_state_add_expander")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("const-char*" "name")
-    '("gboolean" "default_state")
-  )
-)
-
-(define-function ephy_state_save
-  (c-name "ephy_state_save")
-  (return-type "none")
-)
-
-
-
-;; From ../../lib/widgets/ephy-search-entry.h
-
-(define-function ephy_search_entry_get_type
-  (c-name "ephy_search_entry_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_search_entry_new
-  (c-name "ephy_search_entry_new")
-  (is-constructor-of "EphySearchEntry")
-  (return-type "GtkWidget*")
-)
-
-(define-method clear
-  (of-object "EphySearchEntry")
-  (c-name "ephy_search_entry_clear")
-  (return-type "none")
-)
-
-
-
-;; From ../../lib/widgets/ephy-spinner.h
-
-(define-function ephy_spinner_get_type
-  (c-name "ephy_spinner_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_spinner_new
-  (c-name "ephy_spinner_new")
-  (is-constructor-of "EphySpinner")
-  (return-type "GtkWidget*")
-)
-
-(define-method start
-  (of-object "EphySpinner")
-  (c-name "ephy_spinner_start")
-  (return-type "none")
-)
-
-(define-method stop
-  (of-object "EphySpinner")
-  (c-name "ephy_spinner_stop")
-  (return-type "none")
-)
-
-(define-method set_size
-  (of-object "EphySpinner")
-  (c-name "ephy_spinner_set_size")
-  (return-type "none")
-  (parameters
-    '("GtkIconSize" "size")
-  )
-)
-
-
-
-;; From ../src/bookmarks/ephy-bookmarks-type-builtins.h
-
-(define-function ephy_bookmark_property_get_type
-  (c-name "ephy_bookmark_property_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From ../src/bookmarks/ephy-bookmarks.h
-
-(define-function ephy_bookmarks_get_type
-  (c-name "ephy_bookmarks_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_bookmarks_new
-  (c-name "ephy_bookmarks_new")
-  (is-constructor-of "EphyBookmarks")
-  (return-type "EphyBookmarks*")
-)
-
-(define-method get_from_id
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_get_from_id")
-  (return-type "EphyNode*")
-  (parameters
-    '("long" "id")
-  )
-)
-
-(define-method add
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_add")
-  (return-type "EphyNode*")
-  (parameters
-    '("const-char*" "title")
-    '("const-char*" "url")
-  )
-)
-
-(define-method find_bookmark
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_find_bookmark")
-  (return-type "EphyNode*")
-  (parameters
-    '("const-char*" "url")
-  )
-)
-
-(define-method set_icon
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_set_icon")
-  (return-type "none")
-  (parameters
-    '("const-char*" "url")
-    '("const-char*" "icon")
-  )
-)
-
-(define-method set_address
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_set_address")
-  (return-type "none")
-  (parameters
-    '("EphyNode*" "bookmark")
-    '("const-char*" "address")
-  )
-)
-
-(define-method resolve_address
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_resolve_address")
-  (return-type "char*")
-  (parameters
-    '("const-char*" "address")
-    '("const-char*" "parameter")
-  )
-)
-
-(define-function ephy_bookmarks_get_smart_bookmark_width
-  (c-name "ephy_bookmarks_get_smart_bookmark_width")
-  (return-type "guint")
-  (parameters
-    '("EphyNode*" "bookmark")
-  )
-)
-
-(define-method add_keyword
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_add_keyword")
-  (return-type "EphyNode*")
-  (parameters
-    '("const-char*" "name")
-  )
-)
-
-(define-method find_keyword
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_find_keyword")
-  (return-type "EphyNode*")
-  (parameters
-    '("const-char*" "name")
-    '("gboolean" "partial_match")
-  )
-)
-
-(define-method remove_keyword
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_remove_keyword")
-  (return-type "none")
-  (parameters
-    '("EphyNode*" "keyword")
-  )
-)
-
-(define-method has_keyword
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_has_keyword")
-  (return-type "gboolean")
-  (parameters
-    '("EphyNode*" "keyword")
-    '("EphyNode*" "bookmark")
-  )
-)
-
-(define-method set_keyword
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_set_keyword")
-  (return-type "none")
-  (parameters
-    '("EphyNode*" "keyword")
-    '("EphyNode*" "bookmark")
-  )
-)
-
-(define-method unset_keyword
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_unset_keyword")
-  (return-type "none")
-  (parameters
-    '("EphyNode*" "keyword")
-    '("EphyNode*" "bookmark")
-  )
-)
-
-(define-method get_topic_uri
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_get_topic_uri")
-  (return-type "char*")
-  (parameters
-    '("EphyNode*" "node")
-  )
-)
-
-(define-method get_favorites
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_get_favorites")
-  (return-type "EphyNode*")
-)
-
-(define-method get_keywords
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_get_keywords")
-  (return-type "EphyNode*")
-)
-
-(define-method get_bookmarks
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_get_bookmarks")
-  (return-type "EphyNode*")
-)
-
-(define-method get_not_categorized
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_get_not_categorized")
-  (return-type "EphyNode*")
-)
-
-(define-method get_smart_bookmarks
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_get_smart_bookmarks")
-  (return-type "EphyNode*")
-)
-
-
-; This is conditional on configure checks, so might not
-; always be available
-;(define-method get_local
-;  (of-object "EphyBookmarks")
-;  (c-name "ephy_bookmarks_get_local")
-;  (return-type "EphyNode*")
-;)
-
-(define-function ephy_bookmarks_compare_topics
-  (c-name "ephy_bookmarks_compare_topics")
-  (return-type "int")
-  (parameters
-    '("gconstpointer" "a")
-    '("gconstpointer" "b")
-  )
-)
-
-(define-function ephy_bookmarks_compare_topic_pointers
-  (c-name "ephy_bookmarks_compare_topic_pointers")
-  (return-type "int")
-  (parameters
-    '("gconstpointer" "a")
-    '("gconstpointer" "b")
-  )
-)
-
-(define-function ephy_bookmarks_compare_bookmarks
-  (c-name "ephy_bookmarks_compare_bookmarks")
-  (return-type "int")
-  (parameters
-    '("gconstpointer" "a")
-    '("gconstpointer" "b")
-  )
-)
-
-(define-function ephy_bookmarks_compare_bookmark_pointers
-  (c-name "ephy_bookmarks_compare_bookmark_pointers")
-  (return-type "int")
-  (parameters
-    '("gconstpointer" "a")
-    '("gconstpointer" "b")
-  )
-)
-
-
-
-;; From ../src/ephy-extension.h
-
-(define-function ephy_extension_get_type
-  (c-name "ephy_extension_get_type")
-  (return-type "GType")
-)
-
-(define-method attach_window
-  (of-object "EphyExtension")
-  (c-name "ephy_extension_attach_window")
-  (return-type "none")
-  (parameters
-    '("EphyWindow*" "window")
-  )
-)
-
-(define-method detach_window
-  (of-object "EphyExtension")
-  (c-name "ephy_extension_detach_window")
-  (return-type "none")
-  (parameters
-    '("EphyWindow*" "window")
-  )
-)
-
-(define-method attach_tab
-  (of-object "EphyExtension")
-  (c-name "ephy_extension_attach_tab")
-  (return-type "none")
-  (parameters
-    '("EphyWindow*" "window")
-    '("EphyEmbed*" "tab")
-  )
-)
-
-(define-method detach_tab
-  (of-object "EphyExtension")
-  (c-name "ephy_extension_detach_tab")
-  (return-type "none")
-  (parameters
-    '("EphyWindow*" "window")
-    '("EphyEmbed*" "tab")
-  )
-)
-
-
-
-;; From ../../src/ephy-extensions-manager.h
-
-(define-function ephy_extensions_manager_get_type
-  (c-name "ephy_extensions_manager_get_type")
-  (return-type "GType")
-)
-
-(define-method startup
-  (of-object "EphyExtensionsManager")
-  (c-name "ephy_extensions_manager_startup")
-  (return-type "none")
-)
-
-(define-method load
-  (of-object "EphyExtensionsManager")
-  (c-name "ephy_extensions_manager_load")
-  (return-type "none")
-  (parameters
-    '("const-char*" "identifier")
-  )
-)
-
-(define-method unload
-  (of-object "EphyExtensionsManager")
-  (c-name "ephy_extensions_manager_unload")
-  (return-type "none")
-  (parameters
-    '("const-char*" "identifier")
-  )
-)
-
-(define-method register
-  (of-object "EphyExtensionsManager")
-  (c-name "ephy_extensions_manager_register")
-  (return-type "none")
-  (parameters
-    '("GObject*" "object")
-  )
-)
-
-(define-method get_extensions
-  (of-object "EphyExtensionsManager")
-  (c-name "ephy_extensions_manager_get_extensions")
-  (return-type "GList*")
-)
-
-
-
-;; From ../../src/ephy-link-action.h
-
-(define-function ephy_link_action_get_type
-  (c-name "ephy_link_action_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_link_action_group_get_type
-  (c-name "ephy_link_action_group_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_link_action_group_new
-  (c-name "ephy_link_action_group_new")
-  (is-constructor-of "EphyLinkActionGroup")
-  (return-type "EphyLinkActionGroup*")
-  (parameters
-    '("char*" "name")
-  )
-)
-
-
-
-;; From ../src/ephy-link.h
-
-(define-function ephy_link_flags_get_type
-  (c-name "ephy_link_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_link_get_type
-  (c-name "ephy_link_get_type")
-  (return-type "GType")
-)
-
-(define-method open
-  (of-object "EphyLink")
-  (c-name "ephy_link_open")
-  (return-type "EphyEmbed*")
-  (parameters
-    '("const-char*" "address")
-    '("EphyEmbed*" "tab")
-    '("EphyLinkFlags" "flags")
-  )
-)
-
-
-
-;; From ../../src/ephy-location-action.h
-
-(define-function ephy_location_action_get_type
-  (c-name "ephy_location_action_get_type")
-  (return-type "GType")
-)
-
-(define-method get_address
-  (of-object "EphyLocationAction")
-  (c-name "ephy_location_action_get_address")
-  (return-type "const-char*")
-)
-
-(define-method set_address
-  (of-object "EphyLocationAction")
-  (c-name "ephy_location_action_set_address")
-  (return-type "none")
-  (parameters
-    '("const-char*" "address")
-    '("const-char*" "typed_address")
-  )
-)
-
-
-
-;; From ../../src/ephy-notebook.h
-
-(define-function ephy_notebook_get_type
-  (c-name "ephy_notebook_get_type")
-  (return-type "GType")
-)
-
-(define-method add_tab
-  (of-object "EphyNotebook")
-  (c-name "ephy_notebook_add_tab")
-  (return-type "none")
-  (parameters
-    '("EphyEmbed*" "tab")
-    '("int" "position")
-    '("gboolean" "jump_to")
-  )
-)
-
-(define-method set_show_tabs
-  (of-object "EphyNotebook")
-  (c-name "ephy_notebook_set_show_tabs")
-  (return-type "none")
-  (parameters
-    '("gboolean" "show_tabs")
-  )
-)
-
-(define-method set_dnd_enabled
-  (of-object "EphyNotebook")
-  (c-name "ephy_notebook_set_dnd_enabled")
-  (return-type "none")
-  (parameters
-    '("gboolean" "enabled")
-  )
-)
-
-(define-method get_focused_pages
-  (of-object "EphyNotebook")
-  (c-name "ephy_notebook_get_focused_pages")
-  (return-type "GList*")
-)
-
-
-;; From ../../src/ephy-session.h
-
-(define-function ephy_session_get_type
-  (c-name "ephy_session_get_type")
-  (return-type "GType")
-)
-
-(define-method get_active_window
-  (of-object "EphySession")
-  (c-name "ephy_session_get_active_window")
-  (return-type "EphyWindow*")
-)
-
-(define-method save
-  (of-object "EphySession")
-  (c-name "ephy_session_save")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "filename")
-  )
-)
-
-(define-method load
-  (of-object "EphySession")
-  (c-name "ephy_session_load")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "filename")
-    '("guint32" "user_time")
-  )
-)
-
-(define-method close
-  (of-object "EphySession")
-  (c-name "ephy_session_close")
-  (return-type "none")
-)
-
-(define-method get_windows
-  (of-object "EphySession")
-  (c-name "ephy_session_get_windows")
-  (return-type "GList*")
-)
-
-(define-method add_window
-  (of-object "EphySession")
-  (c-name "ephy_session_add_window")
-  (return-type "none")
-  (parameters
-    '("GtkWindow*" "window")
-  )
-)
-
-(define-method remove_window
-  (of-object "EphySession")
-  (c-name "ephy_session_remove_window")
-  (return-type "none")
-  (parameters
-    '("GtkWindow*" "window")
-  )
-)
-
-
-
-;; From ../../src/ephy-shell.h
-
-
-(define-function ephy_new_tab_flags_get_type
-  (c-name "ephy_new_tab_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_shell_get_type
-  (c-name "ephy_shell_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_shell_get_default
-  (c-name "ephy_shell_get_default")
-  (return-type "EphyShell*")
-)
-
-;(define-function ephy_shell_new
-;  (c-name "ephy_shell_new")
-;  (is-constructor-of "EphyShell")
-;  (return-type "EphyShell*")
-;)
-
-(define-method new_tab
-  (of-object "EphyShell")
-  (c-name "ephy_shell_new_tab")
-  (return-type "EphyEmbed*")
-  (parameters
-    '("EphyWindow*" "parent_window")
-    '("EphyEmbed*" "previous_tab")
-    '("const-char*" "url")
-    '("EphyNewTabFlags" "flags")
-  )
-)
-
-(define-method new_tab_full
-  (of-object "EphyShell")
-  (c-name "ephy_shell_new_tab_full")
-  (return-type "EphyEmbed*")
-  (parameters
-    '("EphyWindow*" "parent_window")
-    '("EphyEmbed*" "previous_tab")
-    '("WebKitNetworkRequest*" "request")
-    '("EphyNewTabFlags" "flags")
-    '("EphyEmbedChrome" "chrome")
-    '("gboolean" "is_popup")
-    '("guint32" "user_time")
-  )
-)
-
-(define-method get_session
-  (of-object "EphyShell")
-  (c-name "ephy_shell_get_session")
-  (return-type "GObject*")
-)
-
-(define-method get_bookmarks
-  (of-object "EphyShell")
-  (c-name "ephy_shell_get_bookmarks")
-  (return-type "EphyBookmarks*")
-)
-
-(define-method get_toolbars_model
-  (of-object "EphyShell")
-  (c-name "ephy_shell_get_toolbars_model")
-  (return-type "GObject*")
-  (parameters
-    '("gboolean" "fullscreen")
-  )
-)
-
-(define-method get_extensions_manager
-  (of-object "EphyShell")
-  (c-name "ephy_shell_get_extensions_manager")
-  (return-type "GObject*")
-)
-
-(define-method get_bookmarks_editor
-  (of-object "EphyShell")
-  (c-name "ephy_shell_get_bookmarks_editor")
-  (return-type "GtkWidget*")
-)
-
-(define-method get_history_window
-  (of-object "EphyShell")
-  (c-name "ephy_shell_get_history_window")
-  (return-type "GtkWidget*")
-)
-
-(define-method get_pdm_dialog
-  (of-object "EphyShell")
-  (c-name "ephy_shell_get_pdm_dialog")
-  (return-type "GObject*")
-)
-
-(define-method get_prefs_dialog
-  (of-object "EphyShell")
-  (c-name "ephy_shell_get_prefs_dialog")
-  (return-type "GObject*")
-)
-
-(define-method get_dbus_service
-  (of-object "EphyShell")
-  (c-name "ephy_shell_get_dbus_service")
-  (return-type "GObject*")
-)
-
-
-
-;; From ../../src/ephy-statusbar.h
-
-(define-function ephy_statusbar_get_type
-  (c-name "ephy_statusbar_get_type")
-  (return-type "GType")
-)
-
-;(define-function ephy_statusbar_new
-;  (c-name "ephy_statusbar_new")
-;  (is-constructor-of "EphyStatusbar")
-;  (return-type "GtkWidget*")
-;)
-
-(define-method get_security_frame
-  (of-object "EphyStatusbar")
-  (c-name "ephy_statusbar_get_security_frame")
-  (return-type "GtkWidget*")
-)
-
-(define-method set_security_state
-  (of-object "EphyStatusbar")
-  (c-name "ephy_statusbar_set_security_state")
-  (return-type "none")
-  (parameters
-    '("const-char*" "stock_id")
-    '("const-char*" "tooltip")
-  )
-)
-
-(define-method set_popups_state
-  (of-object "EphyStatusbar")
-  (c-name "ephy_statusbar_set_popups_state")
-  (return-type "none")
-  (parameters
-    '("gboolean" "hidden")
-    '("const-char*" "tooltip")
-  )
-)
-
-(define-method add_widget
-  (of-object "EphyStatusbar")
-  (c-name "ephy_statusbar_add_widget")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-  )
-)
-
-(define-method remove_widget
-  (of-object "EphyStatusbar")
-  (c-name "ephy_statusbar_remove_widget")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-  )
-)
-
-
-
-;; From ../../src/ephy-toolbar.h
-
-(define-function ephy_toolbar_get_type
-  (c-name "ephy_toolbar_get_type")
-  (return-type "GType")
-)
-
-; Don't allow creation of another toolbar
-;(define-function ephy_toolbar_new
-;  (c-name "ephy_toolbar_new")
-;  (is-constructor-of "EphyToolbar")
-;  (return-type "EphyToolbar*")
-;  (parameters
-;    '("EphyWindow*" "window")
-;  )
-;)
-
-(define-method set_favicon
-  (of-object "EphyToolbar")
-  (c-name "ephy_toolbar_set_favicon")
-  (return-type "none")
-  (parameters
-    '("GdkPixbuf*" "icon")
-  )
-)
-
-(define-method set_show_leave_fullscreen
-  (of-object "EphyToolbar")
-  (c-name "ephy_toolbar_set_show_leave_fullscreen")
-  (return-type "none")
-  (parameters
-    '("gboolean" "show")
-  )
-)
-
-(define-method activate_location
-  (of-object "EphyToolbar")
-  (c-name "ephy_toolbar_activate_location")
-  (return-type "none")
-)
-
-(define-method get_location
-  (of-object "EphyToolbar")
-  (c-name "ephy_toolbar_get_location")
-  (return-type "const-char*")
-)
-
-; Don't allow setting the location
-;(define-method set_location
-;  (of-object "EphyToolbar")
-;  (c-name "ephy_toolbar_set_location")
-;  (return-type "none")
-;  (parameters
-;    '("const-char*" "address")
-;    '("const-char*" "typed_address")
-;  )
-;)
-
-; Don't allow setting the nav actions
-;(define-method set_navigation_actions
-;  (of-object "EphyToolbar")
-;  (c-name "ephy_toolbar_set_navigation_actions")
-;  (return-type "none")
-;  (parameters
-;    '("gboolean" "back")
-;    '("gboolean" "forward")
-;    '("gboolean" "up")
-;  )
-;)
-
-; Don't allow setting the security state
-;(define-method set_security_state
-;  (of-object "EphyToolbar")
-;  (c-name "ephy_toolbar_set_security_state")
-;  (return-type "none")
-;  (parameters
-;    '("gboolean" "is_secure")
-;    '("gboolean" "show_lock")
-;    '("const-char*" "stock_id")
-;    '("const-char*" "tooltip")
-;  )
-;)
-
-; Don't allow control of the spinner
-;(define-method set_spinning
-;  (of-object "EphyToolbar")
-;  (c-name "ephy_toolbar_set_spinning")
-;  (return-type "none")
-;  (parameters
-;    '("gboolean" "spinning")
-;  )
-;)
-
-; Don't allow control of the zoom widget
-;(define-method set_zoom
-;  (of-object "EphyToolbar")
-;  (c-name "ephy_toolbar_set_zoom")
-;  (return-type "none")
-;  (parameters
-;    '("gboolean" "can_zoom")
-;    '("float" "zoom")
-;  )
-;)
-
-
-;; From ../src/ephy-type-builtins.h
-
-(define-function ephy_link_flags_get_type
-  (c-name "ephy_link_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_new_tab_flags_get_type
-  (c-name "ephy_new_tab_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_navigation_direction_get_type
-  (c-name "ephy_navigation_direction_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From ../src/ephy-window.h
-
-(define-function ephy_window_get_type
-  (c-name "ephy_window_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_window_new
-  (c-name "ephy_window_new")
-  (is-constructor-of "EphyWindow")
-  (return-type "EphyWindow*")
-)
-
-(define-function ephy_window_new_with_chrome
-  (c-name "ephy_window_new_with_chrome")
-  (return-type "EphyWindow*")
-  (parameters
-    '("EphyEmbedChrome" "chrome")
-    '("gboolean" "is_popup")
-  )
-)
-
-(define-method get_ui_manager
-  (of-object "EphyWindow")
-  (c-name "ephy_window_get_ui_manager")
-  (return-type "GObject*")
-)
-
-(define-method get_toolbar
-  (of-object "EphyWindow")
-  (c-name "ephy_window_get_toolbar")
-  (return-type "GtkWidget*")
-)
-
-(define-method get_notebook
-  (of-object "EphyWindow")
-  (c-name "ephy_window_get_notebook")
-  (return-type "GtkWidget*")
-)
-
-(define-method get_find_toolbar
-  (of-object "EphyWindow")
-  (c-name "ephy_window_get_find_toolbar")
-  (return-type "GtkWidget*")
-)
-
-(define-method get_statusbar
-  (of-object "EphyWindow")
-  (c-name "ephy_window_get_statusbar")
-  (return-type "GtkWidget*")
-)
-
-(define-method load_url
-  (of-object "EphyWindow")
-  (c-name "ephy_window_load_url")
-  (return-type "none")
-  (parameters
-    '("const-char*" "url")
-  )
-)
-
-(define-method set_zoom
-  (of-object "EphyWindow")
-  (c-name "ephy_window_set_zoom")
-  (return-type "none")
-  (parameters
-    '("float" "zoom")
-  )
-)
-
-(define-method activate_location
-  (of-object "EphyWindow")
-  (c-name "ephy_window_activate_location")
-  (return-type "none")
-)
-
-(define-method get_is_print_preview
-  (of-object "EphyWindow")
-  (c-name "ephy_window_get_is_print_preview")
-  (return-type "gboolean")
-)
-
-(define-method get_context_event
-  (of-object "EphyWindow")
-  (c-name "ephy_window_get_context_event")
-  (return-type "EphyEmbedEvent*")
-)
-
-
-;; Boxed types ...
-
-(define-boxed PasswordInfo
-  (in-module "Ephy")
-  (c-name "EphyPasswordInfo")
-  (gtype-id  "EPHY_TYPE_PASSWORD_INFO")
-  (copy_func "ephy_password_info_copy")
-  (release-func "ephy_password_info_free")
-  (fields
-    '("char*" "host")
-    '("char*" "username")
-    '("char*" "password")
-  )
-)
-
-(define-boxed Node
-  (in-module "Ephy")
-  (c-name "EphyNode")
-  (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")
-;;   )
-;; )
diff --git a/src/epiphany.override b/src/epiphany.override
deleted file mode 100644
index 3b183a171..000000000
--- a/src/epiphany.override
+++ /dev/null
@@ -1,428 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- * Copyright © 2005 Adam Hooper <adamh@cvs.gnome.org>
- * Copyright © 2005 Christian Persch <chpe@cvs.gnome.org>
- * Copyright © 2005 Crispin Flowerday <gnome@flowerday.cx>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-%%
-headers
-#include <Python.h>               
-#define NO_IMPORT
-#include <config.h>
-#include <pygobject.h>
-#include <pygtk/pygtk.h>
-#include "ephy-bookmarks.h"
-#include "ephy-bookmarks-type-builtins.h"
-#include "ephy-command-manager.h"
-#include "ephy-dialog.h"
-#include "ephy-embed-event.h"
-#include "ephy-embed-factory.h"
-#include "ephy-embed.h"
-#include "ephy-embed-container.h"
-#include "ephy-embed-persist.h"
-#include "ephy-embed-prefs.h"
-#include "ephy-embed-shell.h"
-#include "ephy-embed-single.h"
-#include "ephy-embed-type-builtins.h"
-#include "ephy-extension.h"
-#include "ephy-extensions-manager.h"
-#include "ephy-find-toolbar.h"
-#include "ephy-history.h"
-#include "ephy-lib-type-builtins.h"
-#include "ephy-node-db.h"
-#include "ephy-node.h"
-#include "ephy-notebook.h"
-#include "ephy-password-manager.h"
-#include "ephy-permission-manager.h"
-#include "ephy-session.h"
-#include "ephy-shell.h"
-#include "ephy-state.h"
-#include "ephy-statusbar.h"
-#include "ephy-type-builtins.h"
-#include "ephy-window.h"
-#include "ephy-link.h"
-#include "ephy-link-action.h"
-#include "egg-toolbars-model.h"
-#include "egg-editable-toolbar.h"
-#include "ephy-toolbars-model.h"
-#include "ephy-toolbar.h"
-#include "ephy-search-entry.h"
-#include "ephy-spinner.h"
-#include "ephy-location-action.h"
-#include "ephy-favicon-cache.h"
-#include "eggtypebuiltins.h"
-
-void pyepiphany_register_classes (PyObject *d); 
-void pyepiphany_add_constants (PyObject *module, const gchar *strip_prefix);
-
-static PyObject *
-_helper_wrap_string_glist (GList *list)
-{
-    GList *tmp;
-    PyObject *py_list;
-
-    if ((py_list = PyList_New(0)) == NULL) {
-        g_list_foreach(list, (GFunc)g_free, NULL);
-        g_list_free(list);
-        return NULL;
-    }
-    for (tmp = list; tmp != NULL; tmp = tmp->next) {
-        PyObject *str_obj =  PyString_FromString ((char*)tmp->data);
-
-        if (str_obj == NULL) {
-            g_list_foreach(list, (GFunc)g_free, NULL);
-            g_list_free(list);
-            Py_DECREF(py_list);
-            return NULL;
-        }
-        PyList_Append(py_list, str_obj);
-        Py_DECREF(str_obj);
-    }
-    g_list_foreach(list, (GFunc)g_free, NULL);
-    g_list_free(list);
-    return py_list;
-}
-
-static PyObject *
-_helper_wrap_gobject_glist (GList *list)
-{
-    PyObject *py_list;
-    GList *tmp;
-
-    if ((py_list = PyList_New(0)) == NULL) {
-        return NULL;
-    }
-    for (tmp = list; tmp != NULL; tmp = tmp->next) {
-        PyObject *py_obj = pygobject_new(G_OBJECT(tmp->data));
-
-        if (py_obj == NULL) {
-            Py_DECREF(py_list);
-            return NULL;
-        }
-        PyList_Append(py_list, py_obj);
-        Py_DECREF(py_obj);
-    }
-    return py_list;
-}
-
-static void
-free_boxed_type (gpointer data, gpointer type)
-{
-    g_boxed_free (GPOINTER_TO_INT(type), data);
-}
-
-
-static PyObject *
-_helper_wrap_boxed_glist (GType type, GList *list)
-{
-    GList *tmp;
-    PyObject *py_list;
-
-    if ((py_list = PyList_New(0)) == NULL) {
-        g_list_foreach(list, free_boxed_type, GINT_TO_POINTER(type));
-        g_list_free(list);
-        return NULL;
-    }
-    for (tmp = list; tmp != NULL; tmp = tmp->next) {
-        PyObject *obj = pyg_boxed_new (type, tmp->data, FALSE, TRUE);
-        PyList_Append(py_list, obj);
-        Py_DECREF(obj);
-    }
-    g_list_free(list);
-    return py_list;
-}
-
-static PyObject *
-_helper_wrap_boxed_gptrarray (GType type, GPtrArray *list, gboolean own_ref, gboolean dealloc)
-{
-    PyObject *py_list;
-    int i;
-
-    if ((py_list = PyList_New(0)) == NULL) {
-        return NULL;
-    }
-    for( i = 0; i < list->len; i++ ) {
-        PyObject *obj = pyg_boxed_new (type, g_ptr_array_index(list,i), FALSE, own_ref);
-        PyList_Append(py_list, obj);
-        Py_DECREF(obj);
-    }
-    if (dealloc) g_ptr_array_free (list, TRUE);
-    return py_list;
-}
-
-%%
-modulename epiphany                     
-%%
-import gtk.Widget as PyGtkWidget_Type
-import gtk.Bin as PyGtkBin_Type
-import gtk.VBox as PyGtkVBox_Type
-import gtk.Statusbar as PyGtkStatusbar_Type
-import gtk.Notebook as PyGtkNotebook_Type
-import gtk.Toolbar as PyGtkToolbar_Type
-import gtk.Entry as PyGtkEntry_Type
-import gtk.EventBox as PyGtkEventBox_Type
-import gtk.Window as PyGtkWindow_Type
-import gtk.Action as PyGtkAction_Type
-import gtk.UIManager as PyGtkUIManager_Type
-import gtk.Menu as PyGtkMenu_Type
-import gtk.ActionGroup as PyGtkActionGroup_Type
-import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
-import gobject.GObject as PyGObject_Type 
-%%
-ignore-glob
-  *_get_type
-%%
-ignore
-  ephy_embed_event_get_dom_event
-  ephy_shell_error_quark
-  ephy_shell_startup
-  ephy_shell_get_dbus_service
-  ephy_find_toolbar_new
-  ephy_find_toolbar_close
-  ephy_find_toolbar_set_embed
-%%
-override-slot EphyShell.tp_init
-
-static int
-_wrap_ephy_shell_tp_init(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { NULL };
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":epiphany.Shell.__init__", kwlist)) {
-        return -1;
-    }
-
-    self->obj = (GObject *) g_object_ref (ephy_shell_get_default());
-    pygobject_register_wrapper((PyObject *)self);
-    return 0;
-}
-%%
-override-slot EphyEmbedShell.tp_init
-
-static int
-_wrap_ephy_embed_shell_tp_init(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { NULL };
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":epiphany.EmbedShell.__init__", kwlist)) {
-        return -1;
-    }
-
-    self->obj = (GObject *) g_object_ref (ephy_embed_shell_get_default());
-    pygobject_register_wrapper((PyObject *)self);
-    return 0;
-}
-%%
-override ephy_embed_event_get_coords noargs
-static PyObject *
-_wrap_ephy_embed_event_get_coords(PyGObject *self)
-{
-    guint x, y;
-
-    ephy_embed_event_get_coords (EPHY_EMBED_EVENT(self->obj), &x, &y);
-    return Py_BuildValue("(ll)", x, y);
-}
-%%
-override ephy_embed_get_security_level noargs
-static PyObject *
-_wrap_ephy_embed_get_security_level(PyGObject *self)
-{
-    EphyEmbedSecurityLevel level;
-    char *description;
-    PyObject* ret;
-    
-    ephy_embed_get_security_level (EPHY_EMBED(self->obj), &level, &description);
-    ret = Py_BuildValue("(Os)", 
-                        pyg_enum_from_gtype (EPHY_TYPE_EMBED_SECURITY_LEVEL, level),
-                        description);
-    g_free (description);
-
-    return ret;
-}
-%%
-override ephy_window_get_tabs noargs
-static PyObject *
-_wrap_ephy_window_get_tabs(PyGObject *self)
-{
-    GList *list;
-    PyObject *py_list;
-
-    list = ephy_window_get_tabs(EPHY_WINDOW (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    g_list_free(list);
-
-    return py_list;
-}
-%%
-override ephy_embed_get_go_up_list noargs
-static PyObject*
-_wrap_ephy_embed_get_go_up_list (PyGObject *self)
-{
-    GSList *list, *tmp;
-    PyObject *py_list;
-
-    list = ephy_embed_get_go_up_list (EPHY_EMBED (self->obj));
-
-    if ((py_list = PyList_New(0)) == NULL) {
-        g_slist_foreach(list, (GFunc)g_free, NULL);
-        g_slist_free(list);
-        return NULL;
-    }
-    for (tmp = list; tmp != NULL; tmp = tmp->next) {
-        PyObject *str_obj =  PyString_FromString ((char*)tmp->data);
-
-        if (str_obj == NULL) {
-            g_slist_foreach(list, (GFunc)g_free, NULL);
-            g_slist_free(list);
-            Py_DECREF(py_list);
-            return NULL;
-        }
-        PyList_Append(py_list, str_obj);
-        Py_DECREF(str_obj);
-    }
-    g_slist_foreach(list, (GFunc)g_free, NULL);
-    g_slist_free(list);
-    return py_list;
-}
-%%
-override ephy_embed_single_get_printer_list noargs
-static PyObject*
-_wrap_ephy_embed_single_get_printer_list (PyGObject *self)
-{
-    GList *list;
-
-    list = ephy_embed_single_get_printer_list (EPHY_EMBED_SINGLE (self->obj));
-
-    return _helper_wrap_string_glist (list);
-}
-%%
-override ephy_embed_single_get_font_list kwargs
-static PyObject*
-_wrap_ephy_embed_single_get_font_list (PyGObject *self,
-                                       PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = {"font_group", NULL}; 
-    char *font_group;
-    GList *list;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, 
-                                     "s:EphyEmbedSingle.get_font_list", kwlist, &font_group))
-        return NULL;
-
-
-    list = ephy_embed_single_get_font_list (EPHY_EMBED_SINGLE (self->obj), font_group);
-
-    return _helper_wrap_string_glist (list);
-}
-%%
-override ephy_embed_event_get_property kwargs
-static PyObject*
-_wrap_ephy_embed_event_get_property (PyGObject *self,
-                                     PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = {"property", NULL}; 
-    char *prop;
-    const GValue *value;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, 
-                                     "s:EphyEmbedEvent.get_property", kwlist, &prop))
-        return NULL;
-
-    value = ephy_embed_event_get_property (EPHY_EMBED_EVENT (self->obj), prop);
-
-    return pyg_value_as_pyobject(value, TRUE);
-}
-%%
-override ephy_password_manager_list_passwords noargs
-static PyObject*
-_wrap_ephy_password_manager_list_passwords (PyGObject *self)
-{
-    GList *list;
-
-    list = ephy_password_manager_list_passwords (EPHY_PASSWORD_MANAGER (self->obj));
-
-    return _helper_wrap_boxed_glist (EPHY_TYPE_PASSWORD_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 ephy_node_get_children noargs
-static PyObject *
-_wrap_ephy_node_get_children (PyGObject *self)
-{
-    GPtrArray *list = ephy_node_get_children ((EphyNode *) (self->obj));
-
-    return _helper_wrap_boxed_gptrarray (EPHY_TYPE_NODE, list, FALSE, FALSE);
-}
-%%
-override ephy_session_get_windows noargs
-static PyObject *
-_wrap_ephy_session_get_windows (PyGObject *self)
-{    
-    GList *list;
-    PyObject *py_list;
-
-    list = ephy_session_get_windows (EPHY_SESSION (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    g_list_free(list);
-
-    return py_list;
-}
-%%
-override ephy_notebook_get_focused_pages noargs
-static PyObject *
-_wrap_ephy_notebook_get_focused_pages (PyGObject *self)
-{    
-    GList *list;
-    PyObject *py_list;
-
-    list = ephy_notebook_get_focused_pages (EPHY_NOTEBOOK (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    return py_list;
-}