Add rules to generate the raw python bindings .defs file, and to check

2005-07-21  Christian Persch  <chpe@cvs.gnome.org>

	* src/Makefile.am:

	Add rules to generate the raw python bindings .defs file,
	and to check that all headers are either used or ignored.

	* src/epiphany.defs:

	Reordered to make diffing against the autogenerated file
	simpler.

3 files changed, 1056 insertions, 936 deletions

diff --git a/ChangeLog b/ChangeLog
index cc08fa273..dc8e79036 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-07-21  Christian Persch  <chpe@cvs.gnome.org>
+
+	* src/Makefile.am:
+
+	Add rules to generate the raw python bindings .defs file,
+	and to check that all headers are either used or ignored.
+
+	* src/epiphany.defs:
+
+	Reordered to make diffing against the autogenerated file
+	simpler.
+
 2005-07-20  Christian Persch  <chpe@cvs.gnome.org>
 
 	* .cvsignore:
diff --git a/src/Makefile.am b/src/Makefile.am
index 86899bcfc..a2e73271e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -234,13 +234,16 @@ endif
 
 BUILT_SOURCES =	\
 	$(CORBA_SOURCE)	\
-	$(TYPES_SOURCE)	\
-	$(PYPHANY_SOURCE)
+	$(TYPES_SOURCE)
 
 TYPES_SOURCE = \
 	ephy-type-builtins.c	\
 	ephy-type-builtins.h
 
+if ENABLE_PYTHON
+BUILT_SOURCES += $(PYPHANY_SOURCE)
+endif
+
 stamp_files = \
 	stamp-ephy-type-builtins.c	\
 	stamp-ephy-type-builtins.h
@@ -296,3 +299,143 @@ epiphany.c: epiphany.defs epiphany.override
 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-cookie-manager.h			\
+	embed/ephy-embed-event.h			\
+	embed/ephy-embed-factory.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-file-chooser.h				\
+	lib/ephy-node-db.h				\
+	lib/ephy-node-filter.h				\
+	lib/ephy-node.h					\
+	lib/ephy-state.h				\
+	lib/widgets/ephy-node-view.h			\
+	lib/widgets/ephy-search-entry.h			\
+	lib/widgets/ephy-spinner.h			\
+	lib/widgets/ephy-tree-model-node.h		\
+	lib/widgets/ephy-tree-model-sort.h		\
+	src/bookmarks/ephy-bookmarksbar.h		\
+	src/bookmarks/ephy-bookmarksbar-model.h		\
+	src/bookmarks/ephy-bookmarks.h			\
+	src/ephy-extension.h				\
+	src/ephy-extensions-manager.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-tab.h					\
+	src/ephy-toolbar.h				\
+	src/ephy-toolbars-model.h			\
+	src/ephy-window.h
+
+BINDING_HEADERS_SRCDIR_IGNORE_IN = \
+	embed/ephy-download.h				\
+	embed/ephy-embed-dialog.h			\
+	embed/ephy-embed-find.h				\
+	embed/ephy-embed-prefs.h			\
+	embed/ephy-encodings.h				\
+	lib/ephy-debug.h				\
+	lib/ephy-dnd.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-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/widgets/ephy-location-entry.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-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-new-bookmark.h		\
+	src/bookmarks/ephy-topic-action.h		\
+	src/bookmarks/ephy-topics-selector.h		\
+	src/ephy-action-helper.h			\
+	src/ephy-automation.h				\
+	src/ephy-completion-model.h			\
+	src/ephy-encoding-dialog.h			\
+	src/ephy-encoding-menu.h			\
+	src/ephy-find-toolbar.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
+
+if ENABLE_DBUS
+BINDING_HEADERS_SRCDIR_IN += \
+	lib/ephy-dbus.h
+else
+BINDING_HEADERS_SRCDIR_IGNORE_IN += \
+	lib/ephy-dbus.h
+endif
+
+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 = \
+	lib/ephy-marshal.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 = $(find $(top_srcdir) $(top_builddir) -type f -name 'ephy-*.h' | 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:
+	test -z "$(BINDING_HEADERS_ALL_UNKNOWN)"
+
+check-local: check-python-binding
+
+endif
diff --git a/src/epiphany.defs b/src/epiphany.defs
index 7917fe846..ea341b6c7 100644
--- a/src/epiphany.defs
+++ b/src/epiphany.defs
@@ -154,43 +154,6 @@
   (gtype-id "EPHY_TYPE_WINDOW")
 )
 
-;; Boxed types ...
-
-(define-boxed Cookie
-  (in-module "Ephy")
-  (c-name "EphyCookie")
-  (gtype-id "EPHY_TYPE_COOKIE")
-  (fields
-    '("char*" "name")
-    '("char*" "value")
-    '("char*" "domain")
-    '("char*" "path")
-    '("gulong" "expires")
-    '("glong" "real_expires")
-    '("guint" "is_secure")
-    '("guint" "is_session")
-  )
-)
-
-(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")
-)
-
 ;; Enumerations and flags ...
 
 (define-enum BookmarkProperty
@@ -447,201 +410,6 @@
 )
 
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/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 get_toolbars_model
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_get_toolbars_model")
-  (return-type "GObject*")
-)
-
-(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 solve_smart_url
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_solve_smart_url")
-  (return-type "char*")
-  (parameters
-    '("const-char*" "smart_url")
-    '("const-char*" "content")
-  )
-)
-
-(define-method show_bookmark_properties
-  (of-object "EphyBookmarks")
-  (c-name "ephy_bookmarks_show_bookmark_properties")
-  (return-type "GtkWidget*")
-  (parameters
-    '("EphyNode*" "bookmark")
-    '("GtkWidget*" "parent_window")
-  )
-)
-
-(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*")
-)
-
-
-
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-bookmarks-type-builtins.h
-
-(define-function ephy_bookmark_property_get_type
-  (c-name "ephy_bookmark_property_get_type")
-  (return-type "GType")
-)
-
-
-
 ;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-command-manager.h
 
 (define-function ephy_command_manager_get_type
@@ -722,164 +490,6 @@
 
 
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/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**" "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 /opt/gnome2/include/epiphany-1.5/epiphany/ephy-embed-event.h
 
 (define-function ephy_embed_event_get_type
@@ -964,261 +574,6 @@
 
 
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-embed.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_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 load_url
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_load_url")
-  (return-type "none")
-  (parameters
-    '("const-char*" "url")
-  )
-)
-
-(define-method stop_load
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_stop_load")
-  (return-type "none")
-)
-
-(define-method reload
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_reload")
-  (return-type "none")
-  (parameters
-    '("gboolean" "force")
-  )
-)
-
-(define-method get_title
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_title")
-  (return-type "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 "char*")
-)
-
-(define-method get_js_status
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_js_status")
-  (return-type "char*")
-)
-
-(define-method can_go_back
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_can_go_back")
-  (return-type "gboolean")
-)
-
-(define-method can_go_forward
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_can_go_forward")
-  (return-type "gboolean")
-)
-
-(define-method can_go_up
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_can_go_up")
-  (return-type "gboolean")
-)
-
-(define-method get_go_up_list
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_go_up_list")
-  (return-type "GSList*")
-)
-
-(define-method go_back
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_go_back")
-  (return-type "none")
-)
-
-(define-method go_forward
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_go_forward")
-  (return-type "none")
-)
-
-(define-method go_up
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_go_up")
-  (return-type "none")
-)
-
-(define-method shistory_n_items
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_shistory_n_items")
-  (return-type "int")
-)
-
-(define-method shistory_get_nth
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_shistory_get_nth")
-  (return-type "none")
-  (parameters
-    '("int" "nth")
-    '("gboolean" "is_relative")
-    '("char**" "url")
-    '("char**" "title")
-  )
-)
-
-(define-method shistory_get_pos
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_shistory_get_pos")
-  (return-type "int")
-)
-
-(define-method shistory_go_nth
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_shistory_go_nth")
-  (return-type "none")
-  (parameters
-    '("int" "nth")
-  )
-)
-
-(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 show_page_certificate
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_show_page_certificate")
-  (return-type "none")
-)
-
-(define-method set_zoom
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_set_zoom")
-  (return-type "none")
-  (parameters
-    '("float" "zoom")
-  )
-)
-
-(define-method get_zoom
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_zoom")
-  (return-type "float")
-)
-
-(define-method get_encoding
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_get_encoding")
-  (return-type "char*")
-)
-
-(define-method has_automatic_encoding
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_has_automatic_encoding")
-  (return-type "gboolean")
-)
-
-(define-method set_encoding
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_set_encoding")
-  (return-type "none")
-  (parameters
-    '("const-char*" "encoding")
-  )
-)
-
-(define-method print
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_print")
-  (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 activate
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_activate")
-  (return-type "none")
-)
-
-(define-method has_modified_forms
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_has_modified_forms")
-  (return-type "gboolean")
-)
-
-
-
 ;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-embed-persist.h
 
 (define-function ephy_embed_persist_flags_get_type
@@ -1386,10 +741,6 @@
 
 
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-embed-prefs.h
-
-
-
 ;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-embed-shell.h
 
 (define-function ephy_embed_shell_get_type
@@ -1492,7 +843,7 @@
 
 
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-embed-type-builtins.h
+;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-embed.h
 
 (define-function ephy_embed_net_state_get_type
   (c-name "ephy_embed_net_state_get_type")
@@ -1504,8 +855,8 @@
   (return-type "GType")
 )
 
-(define-function ephy_embed_print_preview_nav_type_get_type
-  (c-name "ephy_embed_print_preview_nav_type_get_type")
+(define-function ephy_embed_ppv_navigation_get_type
+  (c-name "ephy_embed_ppv_navigation_get_type")
   (return-type "GType")
 )
 
@@ -1519,119 +870,230 @@
   (return-type "GType")
 )
 
-(define-function ephy_embed_event_context_get_type
-  (c-name "ephy_embed_event_context_get_type")
+(define-function ephy_embed_get_type
+  (c-name "ephy_embed_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-method load_url
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_load_url")
+  (return-type "none")
+  (parameters
+    '("const-char*" "url")
+  )
 )
 
-(define-function ephy_content_check_type_get_type
-  (c-name "ephy_content_check_type_get_type")
-  (return-type "GType")
+(define-method stop_load
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_stop_load")
+  (return-type "none")
 )
 
-(define-function ephy_permission_get_type
-  (c-name "ephy_permission_get_type")
-  (return-type "GType")
+(define-method reload
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_reload")
+  (return-type "none")
+  (parameters
+    '("gboolean" "force")
+  )
 )
 
+(define-method get_title
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_get_title")
+  (return-type "char*")
+)
 
+(define-method get_location
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_get_location")
+  (return-type "char*")
+  (parameters
+    '("gboolean" "toplevel")
+  )
+)
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-extension.h
+(define-method get_link_message
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_get_link_message")
+  (return-type "char*")
+)
 
-(define-function ephy_extension_get_type
-  (c-name "ephy_extension_get_type")
-  (return-type "GType")
+(define-method get_js_status
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_get_js_status")
+  (return-type "char*")
 )
 
-(define-method attach_window
-  (of-object "EphyExtension")
-  (c-name "ephy_extension_attach_window")
+(define-method can_go_back
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_can_go_back")
+  (return-type "gboolean")
+)
+
+(define-method can_go_forward
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_can_go_forward")
+  (return-type "gboolean")
+)
+
+(define-method can_go_up
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_can_go_up")
+  (return-type "gboolean")
+)
+
+(define-method get_go_up_list
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_get_go_up_list")
+  (return-type "GSList*")
+)
+
+(define-method go_back
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_go_back")
+  (return-type "none")
+)
+
+(define-method go_forward
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_go_forward")
+  (return-type "none")
+)
+
+(define-method go_up
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_go_up")
+  (return-type "none")
+)
+
+(define-method shistory_n_items
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_shistory_n_items")
+  (return-type "int")
+)
+
+(define-method shistory_get_nth
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_shistory_get_nth")
   (return-type "none")
   (parameters
-    '("EphyWindow*" "window")
+    '("int" "nth")
+    '("gboolean" "is_relative")
+    '("char**" "url")
+    '("char**" "title")
   )
 )
 
-(define-method detach_window
-  (of-object "EphyExtension")
-  (c-name "ephy_extension_detach_window")
+(define-method shistory_get_pos
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_shistory_get_pos")
+  (return-type "int")
+)
+
+(define-method shistory_go_nth
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_shistory_go_nth")
   (return-type "none")
   (parameters
-    '("EphyWindow*" "window")
+    '("int" "nth")
   )
 )
 
-(define-method attach_tab
-  (of-object "EphyExtension")
-  (c-name "ephy_extension_attach_tab")
+(define-method get_security_level
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_get_security_level")
   (return-type "none")
   (parameters
-    '("EphyWindow*" "window")
-    '("EphyTab*" "tab")
+    '("EphyEmbedSecurityLevel*" "level")
+    '("char**" "description")
   )
 )
 
-(define-method detach_tab
-  (of-object "EphyExtension")
-  (c-name "ephy_extension_detach_tab")
+(define-method show_page_certificate
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_show_page_certificate")
+  (return-type "none")
+)
+
+(define-method set_zoom
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_set_zoom")
   (return-type "none")
   (parameters
-    '("EphyWindow*" "window")
-    '("EphyTab*" "tab")
+    '("float" "zoom")
   )
 )
 
+(define-method get_zoom
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_get_zoom")
+  (return-type "float")
+)
 
+(define-method get_encoding
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_get_encoding")
+  (return-type "char*")
+)
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-extensions-manager.h
+(define-method has_automatic_encoding
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_has_automatic_encoding")
+  (return-type "gboolean")
+)
 
-(define-function ephy_extensions_manager_get_type
-  (c-name "ephy_extensions_manager_get_type")
-  (return-type "GType")
+(define-method set_encoding
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_set_encoding")
+  (return-type "none")
+  (parameters
+    '("const-char*" "encoding")
+  )
 )
 
-(define-method startup
-  (of-object "EphyExtensionsManager")
-  (c-name "ephy_extensions_manager_startup")
+(define-method print
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_print")
   (return-type "none")
 )
 
-(define-method load
-  (of-object "EphyExtensionsManager")
-  (c-name "ephy_extensions_manager_load")
+(define-method set_print_preview_mode
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_set_print_preview_mode")
   (return-type "none")
   (parameters
-    '("const-char*" "identifier")
+    '("gboolean" "preview_mode")
   )
 )
 
-(define-method unload
-  (of-object "EphyExtensionsManager")
-  (c-name "ephy_extensions_manager_unload")
+(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
-    '("const-char*" "identifier")
+    '("EphyEmbedPrintPreviewNavType" "type")
+    '("int" "page")
   )
 )
 
-(define-method register
-  (of-object "EphyExtensionsManager")
-  (c-name "ephy_extensions_manager_register")
+(define-method activate
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_activate")
   (return-type "none")
-  (parameters
-    '("GObject*" "object")
-  )
 )
 
-(define-method get_extensions
-  (of-object "EphyExtensionsManager")
-  (c-name "ephy_extensions_manager_get_extensions")
-  (return-type "GList*")
+(define-method has_modified_forms
+  (of-object "EphyEmbed")
+  (c-name "ephy_embed_has_modified_forms")
+  (return-type "gboolean")
 )
 
 
@@ -1755,73 +1217,308 @@
 
 
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-lib-type-builtins.h
+;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-password-manager.h
 
-(define-function ephy_node_signal_type_get_type
-  (c-name "ephy_node_signal_type_get_type")
+(define-function ephy_password_info_get_type
+  (c-name "ephy_password_info_get_type")
   (return-type "GType")
 )
 
-(define-function ephy_state_window_flags_get_type
-  (c-name "ephy_state_window_flags_get_type")
+(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")
+  )
+)
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-link.h
+(define-method list_passwords
+  (of-object "EphyPasswordManager")
+  (c-name "ephy_password_manager_list_passwords")
+  (return-type "GList*")
+)
 
-(define-function ephy_link_flags_get_type
-  (c-name "ephy_link_flags_get_type")
+
+
+;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-permission-manager.h
+
+(define-function ephy_permission_get_type
+  (c-name "ephy_permission_get_type")
   (return-type "GType")
 )
 
-(define-function ephy_link_get_type
-  (c-name "ephy_link_get_type")
+(define-function ephy_permission_info_get_type
+  (c-name "ephy_permission_info_get_type")
   (return-type "GType")
 )
 
-(define-method open
-  (of-object "EphyLink")
-  (c-name "ephy_link_open")
-  (return-type "EphyTab*")
+(define-function ephy_permission_info_new
+  (c-name "ephy_permission_info_new")
+  (is-constructor-of "EphyPermissionInfo")
+  (return-type "EphyPermissionInfo*")
   (parameters
-    '("const-char*" "address")
-    '("EphyTab*" "tab")
-    '("EphyLinkFlags" "flags")
+    '("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
+  (of-object "EphyPermissionManager")
+  (c-name "ephy_permission_manager_add")
+  (return-type "none")
+  (parameters
+    '("const-char*" "host")
+    '("const-char*" "type")
+    '("EphyPermission" "permission")
+  )
+)
+
+(define-method remove
+  (of-object "EphyPermissionManager")
+  (c-name "ephy_permission_manager_remove")
+  (return-type "none")
+  (parameters
+    '("const-char*" "host")
+    '("const-char*" "type")
+  )
+)
+
+(define-method clear
+  (of-object "EphyPermissionManager")
+  (c-name "ephy_permission_manager_clear")
+  (return-type "none")
+)
+
+(define-method test
+  (of-object "EphyPermissionManager")
+  (c-name "ephy_permission_manager_test")
+  (return-type "EphyPermission")
+  (parameters
+    '("const-char*" "host")
+    '("const-char*" "type")
+  )
+)
+
+(define-method list
+  (of-object "EphyPermissionManager")
+  (c-name "ephy_permission_manager_list")
+  (return-type "GList*")
+  (parameters
+    '("const-char*" "type")
   )
 )
 
 
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-loader.h
+;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-dialog.h
 
-(define-function ephy_loader_get_type
-  (c-name "ephy_loader_get_type")
+(define-function ephy_dialog_get_type
+  (c-name "ephy_dialog_get_type")
   (return-type "GType")
 )
 
-(define-method type
-  (of-object "EphyLoader")
-  (c-name "ephy_loader_type")
-  (return-type "const-char*")
+(define-function ephy_dialog_new
+  (c-name "ephy_dialog_new")
+  (is-constructor-of "EphyDialog")
+  (return-type "EphyDialog*")
 )
 
-(define-method get_object
-  (of-object "EphyLoader")
-  (c-name "ephy_loader_get_object")
-  (return-type "GObject*")
+(define-function ephy_dialog_new_with_parent
+  (c-name "ephy_dialog_new_with_parent")
+  (is-constructor-of "EphyDialog")
+  (return-type "EphyDialog*")
   (parameters
-    '("GData**" "attributes")
+    '("GtkWidget*" "parent_window")
   )
 )
 
-(define-method release_object
-  (of-object "EphyLoader")
-  (c-name "ephy_loader_release_object")
+(define-method construct
+  (of-object "EphyDialog")
+  (c-name "ephy_dialog_construct")
   (return-type "none")
   (parameters
-    '("GObject*" "object")
+    '("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**" "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")
   )
 )
 
@@ -2176,214 +1873,413 @@
 
 
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-notebook.h
+;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-state.h
 
-(define-function ephy_notebook_get_type
-  (c-name "ephy_notebook_get_type")
+(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*" "expander")
+    '("const-char*" "name")
+    '("gboolean" "default_state")
+  )
+)
+
+(define-function ephy_state_save
+  (c-name "ephy_state_save")
+  (return-type "none")
+)
+
+
+
+;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-bookmarks.h
+
+(define-function ephy_bookmarks_get_type
+  (c-name "ephy_bookmarks_get_type")
   (return-type "GType")
 )
 
-(define-function ephy_notebook_new
-  (c-name "ephy_notebook_new")
-  (is-constructor-of "EphyNotebook")
-  (return-type "GtkWidget*")
+(define-function ephy_bookmarks_new
+  (c-name "ephy_bookmarks_new")
+  (is-constructor-of "EphyBookmarks")
+  (return-type "EphyBookmarks*")
 )
 
-(define-method add_tab
-  (of-object "EphyNotebook")
-  (c-name "ephy_notebook_add_tab")
+(define-method get_from_id
+  (of-object "EphyBookmarks")
+  (c-name "ephy_bookmarks_get_from_id")
+  (return-type "EphyNode*")
+  (parameters
+    '("long" "id")
+  )
+)
+
+(define-method get_toolbars_model
+  (of-object "EphyBookmarks")
+  (c-name "ephy_bookmarks_get_toolbars_model")
+  (return-type "GObject*")
+)
+
+(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
-    '("EphyTab*" "tab")
-    '("int" "position")
-    '("gboolean" "jump_to")
+    '("const-char*" "url")
+    '("const-char*" "icon")
   )
 )
 
-(define-method remove_tab
-  (of-object "EphyNotebook")
-  (c-name "ephy_notebook_remove_tab")
+(define-method set_address
+  (of-object "EphyBookmarks")
+  (c-name "ephy_bookmarks_set_address")
   (return-type "none")
   (parameters
-    '("EphyTab*" "tab")
+    '("EphyNode*" "bookmark")
+    '("const-char*" "address")
   )
 )
 
-(define-method move_tab
-  (of-object "EphyNotebook")
-  (c-name "ephy_notebook_move_tab")
+(define-method solve_smart_url
+  (of-object "EphyBookmarks")
+  (c-name "ephy_bookmarks_solve_smart_url")
+  (return-type "char*")
+  (parameters
+    '("const-char*" "smart_url")
+    '("const-char*" "content")
+  )
+)
+
+(define-method show_bookmark_properties
+  (of-object "EphyBookmarks")
+  (c-name "ephy_bookmarks_show_bookmark_properties")
+  (return-type "GtkWidget*")
+  (parameters
+    '("EphyNode*" "bookmark")
+    '("GtkWidget*" "parent_window")
+  )
+)
+
+(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
-    '("EphyNotebook*" "dest")
-    '("EphyTab*" "tab")
-    '("int" "dest_position")
+    '("EphyNode*" "keyword")
   )
 )
 
-(define-method set_show_tabs
-  (of-object "EphyNotebook")
-  (c-name "ephy_notebook_set_show_tabs")
+(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
-    '("gboolean" "show_tabs")
+    '("EphyNode*" "keyword")
+    '("EphyNode*" "bookmark")
   )
 )
 
-(define-method set_dnd_enabled
-  (of-object "EphyNotebook")
-  (c-name "ephy_notebook_set_dnd_enabled")
+(define-method unset_keyword
+  (of-object "EphyBookmarks")
+  (c-name "ephy_bookmarks_unset_keyword")
   (return-type "none")
   (parameters
-    '("gboolean" "enabled")
+    '("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*")
+)
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-password-manager.h
+(define-method get_keywords
+  (of-object "EphyBookmarks")
+  (c-name "ephy_bookmarks_get_keywords")
+  (return-type "EphyNode*")
+)
 
-(define-function ephy_password_info_get_type
-  (c-name "ephy_password_info_get_type")
+(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*")
+)
+
+
+
+;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-extension.h
+
+(define-function ephy_extension_get_type
+  (c-name "ephy_extension_get_type")
   (return-type "GType")
 )
 
-(define-function ephy_password_info_new
-  (c-name "ephy_password_info_new")
-  (is-constructor-of "EphyPasswordInfo")
-  (return-type "EphyPasswordInfo*")
+(define-method attach_window
+  (of-object "EphyExtension")
+  (c-name "ephy_extension_attach_window")
+  (return-type "none")
   (parameters
-    '("const-char*" "host")
-    '("const-char*" "username")
-    '("const-char*" "password")
+    '("EphyWindow*" "window")
   )
 )
 
-(define-method copy
-  (of-object "EphyPasswordInfo")
-  (c-name "ephy_password_info_copy")
-  (return-type "EphyPasswordInfo*")
+(define-method detach_window
+  (of-object "EphyExtension")
+  (c-name "ephy_extension_detach_window")
+  (return-type "none")
+  (parameters
+    '("EphyWindow*" "window")
+  )
 )
 
-(define-method free
-  (of-object "EphyPasswordInfo")
-  (c-name "ephy_password_info_free")
+(define-method attach_tab
+  (of-object "EphyExtension")
+  (c-name "ephy_extension_attach_tab")
   (return-type "none")
+  (parameters
+    '("EphyWindow*" "window")
+    '("EphyTab*" "tab")
+  )
 )
 
-(define-function ephy_password_manager_get_type
-  (c-name "ephy_password_manager_get_type")
+(define-method detach_tab
+  (of-object "EphyExtension")
+  (c-name "ephy_extension_detach_tab")
+  (return-type "none")
+  (parameters
+    '("EphyWindow*" "window")
+    '("EphyTab*" "tab")
+  )
+)
+
+
+
+;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-extensions-manager.h
+
+(define-function ephy_extensions_manager_get_type
+  (c-name "ephy_extensions_manager_get_type")
   (return-type "GType")
 )
 
-(define-method add_password
-  (of-object "EphyPasswordManager")
-  (c-name "ephy_password_manager_add_password")
+(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
-    '("EphyPasswordInfo*" "info")
+    '("const-char*" "identifier")
   )
 )
 
-(define-method remove_password
-  (of-object "EphyPasswordManager")
-  (c-name "ephy_password_manager_remove_password")
+(define-method unload
+  (of-object "EphyExtensionsManager")
+  (c-name "ephy_extensions_manager_unload")
   (return-type "none")
   (parameters
-    '("EphyPasswordInfo*" "info")
+    '("const-char*" "identifier")
   )
 )
 
-(define-method list_passwords
-  (of-object "EphyPasswordManager")
-  (c-name "ephy_password_manager_list_passwords")
+(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 /opt/gnome2/include/epiphany-1.5/epiphany/ephy-permission-manager.h
+;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-link.h
 
-(define-function ephy_permission_get_type
-  (c-name "ephy_permission_get_type")
+(define-function ephy_link_flags_get_type
+  (c-name "ephy_link_flags_get_type")
   (return-type "GType")
 )
 
-(define-function ephy_permission_info_get_type
-  (c-name "ephy_permission_info_get_type")
+(define-function ephy_link_get_type
+  (c-name "ephy_link_get_type")
   (return-type "GType")
 )
 
-(define-function ephy_permission_info_new
-  (c-name "ephy_permission_info_new")
-  (is-constructor-of "EphyPermissionInfo")
-  (return-type "EphyPermissionInfo*")
+(define-method open
+  (of-object "EphyLink")
+  (c-name "ephy_link_open")
+  (return-type "EphyTab*")
   (parameters
-    '("const-char*" "host")
-    '("const-char*" "type")
-    '("EphyPermission" "permission")
+    '("const-char*" "address")
+    '("EphyTab*" "tab")
+    '("EphyLinkFlags" "flags")
   )
 )
 
-(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")
+;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-notebook.h
+
+(define-function ephy_notebook_get_type
+  (c-name "ephy_notebook_get_type")
   (return-type "GType")
 )
 
-(define-method add
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_add")
+(define-function ephy_notebook_new
+  (c-name "ephy_notebook_new")
+  (is-constructor-of "EphyNotebook")
+  (return-type "GtkWidget*")
+)
+
+(define-method add_tab
+  (of-object "EphyNotebook")
+  (c-name "ephy_notebook_add_tab")
   (return-type "none")
   (parameters
-    '("const-char*" "host")
-    '("const-char*" "type")
-    '("EphyPermission" "permission")
+    '("EphyTab*" "tab")
+    '("int" "position")
+    '("gboolean" "jump_to")
   )
 )
 
-(define-method remove
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_remove")
+(define-method remove_tab
+  (of-object "EphyNotebook")
+  (c-name "ephy_notebook_remove_tab")
   (return-type "none")
   (parameters
-    '("const-char*" "host")
-    '("const-char*" "type")
+    '("EphyTab*" "tab")
   )
 )
 
-(define-method clear
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_clear")
+(define-method move_tab
+  (of-object "EphyNotebook")
+  (c-name "ephy_notebook_move_tab")
   (return-type "none")
+  (parameters
+    '("EphyNotebook*" "dest")
+    '("EphyTab*" "tab")
+    '("int" "dest_position")
+  )
 )
 
-(define-method test
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_test")
-  (return-type "EphyPermission")
+(define-method set_show_tabs
+  (of-object "EphyNotebook")
+  (c-name "ephy_notebook_set_show_tabs")
+  (return-type "none")
   (parameters
-    '("const-char*" "host")
-    '("const-char*" "type")
+    '("gboolean" "show_tabs")
   )
 )
 
-(define-method list
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_list")
-  (return-type "GList*")
+(define-method set_dnd_enabled
+  (of-object "EphyNotebook")
+  (c-name "ephy_notebook_set_dnd_enabled")
+  (return-type "none")
   (parameters
-    '("const-char*" "type")
+    '("gboolean" "enabled")
   )
 )
 
@@ -2605,48 +2501,6 @@
 
 
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/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*" "expander")
-    '("const-char*" "name")
-    '("gboolean" "default_state")
-  )
-)
-
-(define-function ephy_state_save
-  (c-name "ephy_state_save")
-  (return-type "none")
-)
-
-
-
 ;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-statusbar.h
 
 (define-function ephy_statusbar_get_type
@@ -2839,45 +2693,6 @@
 
 
 
-;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-type-builtins.h
-
-(define-function ephy_link_flags_get_type
-  (c-name "ephy_link_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_shell_error_get_type
-  (c-name "ephy_shell_error_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_shell_startup_flags_get_type
-  (c-name "ephy_shell_startup_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_tab_navigation_flags_get_type
-  (c-name "ephy_tab_navigation_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_tab_address_expire_get_type
-  (c-name "ephy_tab_address_expire_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_navigation_direction_get_type
-  (c-name "ephy_navigation_direction_get_type")
-  (return-type "GType")
-)
-
-
-
 ;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-window.h
 
 (define-function ephy_window_get_type
@@ -3022,3 +2837,153 @@
   (return-type "gboolean")
 )
 
+
+
+;; From /opt/gnome2/include/epiphany-1.5/epiphany/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 /opt/gnome2/include/epiphany-1.5/epiphany/ephy-lib-type-builtins.h
+
+(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 /opt/gnome2/include/epiphany-1.5/epiphany/ephy-bookmarks-type-builtins.h
+
+(define-function ephy_bookmark_property_get_type
+  (c-name "ephy_bookmark_property_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From /opt/gnome2/include/epiphany-1.5/epiphany/ephy-type-builtins.h
+
+(define-function ephy_link_flags_get_type
+  (c-name "ephy_link_flags_get_type")
+  (return-type "GType")
+)
+
+(define-function ephy_shell_error_get_type
+  (c-name "ephy_shell_error_get_type")
+  (return-type "GType")
+)
+
+(define-function ephy_shell_startup_flags_get_type
+  (c-name "ephy_shell_startup_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_tab_navigation_flags_get_type
+  (c-name "ephy_tab_navigation_flags_get_type")
+  (return-type "GType")
+)
+
+(define-function ephy_tab_address_expire_get_type
+  (c-name "ephy_tab_address_expire_get_type")
+  (return-type "GType")
+)
+
+(define-function ephy_navigation_direction_get_type
+  (c-name "ephy_navigation_direction_get_type")
+  (return-type "GType")
+)
+
+
+
+;; Boxed types ...
+
+(define-boxed Cookie
+  (in-module "Ephy")
+  (c-name "EphyCookie")
+  (gtype-id "EPHY_TYPE_COOKIE")
+  (fields
+    '("char*" "name")
+    '("char*" "value")
+    '("char*" "domain")
+    '("char*" "path")
+    '("gulong" "expires")
+    '("glong" "real_expires")
+    '("guint" "is_secure")
+    '("guint" "is_session")
+  )
+)
+
+(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")
+)
+