Complete docs base implementation. Should work more or less.

2003-11-19  Marco Pesenti Gritti  <marco@gnome.org>

        * doc/reference/.cvsignore:
        * doc/reference/Makefile.am:
        * doc/reference/epiphany-docs.sgml:
        * doc/reference/epiphany.types:
        * doc/reference/tmpl/config.sgml:
        * doc/reference/tmpl/ephy-session.sgml:
        * doc/reference/tmpl/ephy-shell.sgml:

        Complete docs base implementation. Should work
        more or less.

        * embed/Makefile.am:
        * lib/Makefile.am:
        * src/Makefile.am:

        Cleanup a bit libs build and use a static lib
        also for the src/ code so that we can use it
        for documents.

        * src/ephy-nautilus-view.c:

        Bad chpe forgot to modify func signature.

13 files changed, 862 insertions, 56 deletions

diff --git a/ChangeLog b/ChangeLog
index c6c5881d2..2a5f6e0fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2003-11-19  Marco Pesenti Gritti  <marco@gnome.org>
+
+	* doc/reference/.cvsignore:
+	* doc/reference/Makefile.am:
+	* doc/reference/epiphany-docs.sgml:
+	* doc/reference/epiphany.types:
+	* doc/reference/tmpl/config.sgml:
+	* doc/reference/tmpl/ephy-session.sgml:
+	* doc/reference/tmpl/ephy-shell.sgml:
+
+	Complete docs base implementation. Should work
+	more or less.
+
+	* embed/Makefile.am:
+	* lib/Makefile.am:
+	* src/Makefile.am:
+
+	Cleanup a bit libs build and use a static lib
+	also for the src/ code so that we can use it
+	for documents.
+
+	* src/ephy-nautilus-view.c:
+
+	Bad chpe forgot to modify func signature.
+
 2003-11-19  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/ephy-embed.c:
diff --git a/doc/reference/.cvsignore b/doc/reference/.cvsignore
new file mode 100644
index 000000000..bc80ac90e
--- /dev/null
+++ b/doc/reference/.cvsignore
@@ -0,0 +1,15 @@
+Makefile
+Makefile.in
+epiphany-decl-list.txt
+epiphany-decl.txt
+epiphany-sections.txt
+epiphany-undocumented.txt
+epiphany-unused.txt
+epiphany.args
+epiphany.hierarchy
+epiphany.interfaces
+epiphany.prerequisites
+epiphany.signals
+*.stamp
+html
+xml
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 9973047af..8d63ecca5 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -26,7 +26,124 @@ HFILE_GLOB=$(top_srcdir)/lib/*.h
 CFILE_GLOB=$(top_srcdir)/lib/*.c
 
 # Header files to ignore when scanning.
-IGNORE_HFILES= BaseProtocolContentHandler.h BaseProtocolHandler.h ContentHandler.h EphyAboutRedirector.h EphyBrowser.h EphyEventListener.h EphyHeaderSniffer.h EventContext.h ExternalProtocolHandlers.h ExternalProtocolService.h FilePicker.h GlobalHistory.h GtkNSSClientAuthDialogs.h GtkNSSDialogs.h GtkNSSKeyPairDialogs.h MozDownload.h mozilla-download.h mozilla-embed.h mozilla-embed-persist.h mozilla-embed-single.h mozilla-notifiers.h MozillaPrivate.h MozRegisterComponents.h nsUnicharUtils.h PrintingPromptService.h
+IGNORE_HFILES = \
+	eel-gconf-extensions.h \
+	ephy-bonobo-extensions.h \
+	ephy-debug.h \
+	ephy-dialog.h \
+	ephy-dnd.h \
+	ephy-file-chooser.h \
+	ephy-file-helpers.h \
+	ephy-glade.h \
+	ephy-gui.h \
+	ephy-langs.h \
+	ephy-marshal.h \
+	ephy-module-loader.h \
+	ephy-node-common.h \
+	ephy-node-db.h \
+	ephy-node-filter.h \
+	ephy-node.h \
+	ephy-prefs.h \
+	ephy-state.h \
+	ephy-stock-icons.h \
+	ephy-string.h \
+	ephy-thread-helpers.h \
+	ephy-zoom.h \
+	ephy-arrow-toolbutton.h \
+	ephy-cell-renderer-progress.h \
+	ephy-ellipsizing-label.h \
+	ephy-location-entry.h \
+	ephy-node-view.h \
+	ephy-search-entry.h \
+	ephy-spinner.h \
+	ephy-tree-model-node.h \
+	ephy-tree-model-sort.h \
+	ephy-zoom-action.h \
+	ephy-zoom-control.h \
+	downloader-view.h \
+	ephy-command-manager.h \
+	ephy-download.h \
+	ephy-embed-dialog.h \
+	ephy-embed-event.h \
+	ephy-embed.h \
+	ephy-embed-persist.h \
+	ephy-embed-popup-control.h \
+	ephy-embed-prefs.h \
+	ephy-embed-shell.h \
+	ephy-embed-single.h \
+	ephy-encodings.h \
+	ephy-favicon-cache.h \
+	ephy-history.h \
+	find-dialog.h \
+	print-dialog.h \
+	BaseProtocolContentHandler.h \
+	BaseProtocolHandler.h \
+	ContentHandler.h \
+	EphyAboutRedirector.h \
+	EphyBrowser.h \
+	EphyEventListener.h \
+	EphyHeaderSniffer.h \
+	EventContext.h \
+	ExternalProtocolHandlers.h \
+	ExternalProtocolService.h \
+	FilePicker.h \
+	GlobalHistory.h \
+	GtkNSSClientAuthDialogs.h \
+	GtkNSSDialogs.h \
+	GtkNSSKeyPairDialogs.h \
+	MozDownload.h \
+	mozilla-download.h \
+	mozilla-embed.h \
+	mozilla-embed-persist.h \
+	mozilla-embed-single.h \
+	mozilla-notifiers.h \
+	MozillaPrivate.h \
+	MozRegisterComponents.h \
+	nsUnicharUtils.h \
+	PrintingPromptService.h \
+	egg-editable-toolbar.h \
+	eggintl.h \
+	eggmarshalers.h \
+	egg-toolbar-editor.h \
+	egg-toolbars-model.h \
+	eggtreemultidnd.h \
+	ephy-bookmark-action.h \
+	ephy-bookmark-properties.h \
+	ephy-bookmarks-editor.h \
+	ephy-bookmarks-export.h \
+	ephy-bookmarks.h \
+	ephy-bookmarks-import.h \
+	ephy-bookmarks-menu.h \
+	ephy-new-bookmark.h \
+	ephy-topic-action.h \
+	ephy-topics-selector.h \
+	ephy-automation.h \
+	EphyAutomation.h \
+	ephy-completion-model.h \
+	ephy-encoding-dialog.h \
+	ephy-encoding-menu.h \
+	ephy-extension.h \
+	ephy-extensions-manager.h \
+	ephy-favicon-action.h \
+	ephy-favorites-menu.h \
+	ephy-go-action.h \
+	ephy-history-window.h \
+	ephy-location-action.h \
+	ephy-nautilus-view.h \
+	ephy-navigation-action.h \
+	ephy-notebook.h \
+	ephy-tab.h \
+	ephy-tabs-menu.h \
+	ephy-toolbars-model.h \
+	ephy-window.h \
+	language-editor.h \
+	pdm-dialog.h \
+	popup-commands.h \
+	ppview-toolbar.h \
+	prefs-dialog.h \
+	statusbar.h \
+	toolbar.h \
+	window-commands.h
 
 # Images to copy into HTML directory.
 HTML_IMAGES =
@@ -48,15 +165,164 @@ GTKDOC_CFLAGS = -I$(top_srcdir)/src \
 		$(EPIPHANY_DEPENDENCY_CFLAGS)
 
 GTKDOC_LIBS = \
-	$(top_builddir)/embed/libephyembed.la \
-	$(top_builddir)/lib/libephy.la \
+	$(top_builddir)/src/libephymain.la \
 	$(top_builddir)/src/bookmarks/libephybookmarks.la \
-	$(EPIPHANY_DEPENDENCY_LIBS)
+	$(top_builddir)/embed/libephyembed.la \
+	$(top_builddir)/embed/mozilla/libephymozillaembed.la \
+	$(top_builddir)/lib/widgets/libephywidgets.la \
+	$(top_builddir)/lib/libephymisc.la \
+	$(top_builddir)/lib/egg/libegg.la \
+	$(MOZILLA_COMPONENT_LIBS)	\
+	$(EPIPHANY_DEPENDENCY_LIBS) \
+	$(INTLLIBS)
 
 # If you need to override some of the declarations, place them in the
 # $(DOC_MODULE)-overrides.txt file and uncomment the second line here.
 DOC_OVERRIDES =
 
 # include common portion ...
-include $(top_srcdir)/gtk-doc.make
+# include $(top_srcdir)/gtk-doc.make
+# We need to copy/paste this to be able to change LD_LIBRARY_PATH
+
+if GTK_DOC_USE_LIBTOOL
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+else
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+endif
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+EXTRA_DIST = 				\
+	$(content_files)		\
+	$(HTML_IMAGES)			\
+	$(DOC_MAIN_SGML_FILE)		\
+	$(DOC_MODULE).types		\
+	$(DOC_MODULE)-sections.txt	\
+	$(DOC_MODULE)-overrides.txt
+
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES = 		 \
+	$(DOC_MODULE).args 	 \
+	$(DOC_MODULE).hierarchy  \
+	$(DOC_MODULE).interfaces \
+	$(DOC_MODULE).prerequisites \
+	$(DOC_MODULE).signals
+
+CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB)
+	@echo '*** Scanning header files ***'
+	@-chmod -R u+w $(srcdir)
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+	    LD_LIBRARY_PATH=$(MOZILLA_HOME):$$LD_LIBRARY_PATH CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	else \
+	    cd $(srcdir) ; \
+	    for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+	    done \
+	fi
+	cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+	@true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+	@echo '*** Rebuilding template files ***'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+	touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+	@true
+
+#### xml ####
+
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+	@echo '*** Building XML ***'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS)
+	touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+	@true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo '*** Building HTML ***'
+	@-chmod -R u+w $(srcdir)
+	rm -rf $(srcdir)/html 
+	mkdir $(srcdir)/html
+	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@echo '-- Fixing Crossreferences' 
+	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	touch html-build.stamp
+endif
+
+##############
+
+clean-local:
+	rm -f *~ *.bak
+
+maintainer-clean-local: clean
+	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
+	(installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+	  done; \
+	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
+	fi)
+
+uninstall-local:
+	rm -f $(DESTDIR)$(TARGET_DIR)/*
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+	mkdir $(distdir)/tmpl
+	mkdir $(distdir)/xml
+	mkdir $(distdir)/html
+	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+	-cp $(srcdir)/xml/*.xml $(distdir)/xml
+	-cp $(srcdir)/html/* $(distdir)/html
 
+.PHONY : dist-hook-local
diff --git a/doc/reference/epiphany-docs.sgml b/doc/reference/epiphany-docs.sgml
index bc8dbb8d8..7115f2aa7 100644
--- a/doc/reference/epiphany-docs.sgml
+++ b/doc/reference/epiphany-docs.sgml
@@ -8,42 +8,8 @@
 
   <chapter>
     <title>[Insert title here]</title>
-    <xi:include href="xml/ephy-dialog.xml"/>
-    <xi:include href="xml/ephy-file-chooser.xml"/>
-    <xi:include href="xml/ephy-module-loader.xml"/>
-    <xi:include href="xml/ephy-node-db.xml"/>
-    <xi:include href="xml/ephy-node-filter.xml"/>
-    <xi:include href="xml/ephy-node.xml"/>
-    <xi:include href="xml/ephy-prefs.xml"/>
-    <xi:include href="xml/eggtreemultidnd.xml"/>
-    <xi:include href="xml/ephy-arrow-toolbutton.xml"/>
-    <xi:include href="xml/ephy-ellipsizing-label.xml"/>
-    <xi:include href="xml/ephy-location-entry.xml"/>
-    <xi:include href="xml/ephy-node-view.xml"/>
-    <xi:include href="xml/ephy-search-entry.xml"/>
-    <xi:include href="xml/ephy-spinner.xml"/>
-    <xi:include href="xml/ephy-tree-model-node.xml"/>
-    <xi:include href="xml/ephy-tree-model-sort.xml"/>
-    <xi:include href="xml/ephy-zoom-action.xml"/>
-    <xi:include href="xml/ephy-zoom-control.xml"/>
-    <xi:include href="xml/eel-gconf-extensions.xml"/>
-    <xi:include href="xml/ephy-bonobo-extensions.xml"/>
-    <xi:include href="xml/ephy-debug.xml"/>
-    <xi:include href="xml/ephy-dnd.xml"/>
-    <xi:include href="xml/ephy-file-helpers.xml"/>
-    <xi:include href="xml/ephy-glade.xml"/>
-    <xi:include href="xml/ephy-gui.xml"/>
-    <xi:include href="xml/ephy-langs.xml"/>
-    <xi:include href="xml/ephy-node-common.xml"/>
-    <xi:include href="xml/ephy-state.xml"/>
-    <xi:include href="xml/ephy-stock-icons.xml"/>
-    <xi:include href="xml/ephy-string.xml"/>
-    <xi:include href="xml/ephy-thread-helpers.xml"/>
-    <xi:include href="xml/ephy-zoom.xml"/>
-    <xi:include href="xml/ephy-marshal.xml"/>
-    <xi:include href="xml/egg-editable-toolbar.xml"/>
-    <xi:include href="xml/egg-toolbar-editor.xml"/>
-    <xi:include href="xml/egg-toolbars-model.xml"/>
-    <xi:include href="xml/ephy-cell-renderer-progress.xml"/>
+    <xi:include href="xml/ephy-session.xml"/>
+    <xi:include href="xml/ephy-shell.xml"/>
+    <xi:include href="xml/config.xml"/>
   </chapter>
 </book>
diff --git a/doc/reference/epiphany.types b/doc/reference/epiphany.types
index 18f11650f..5b19d2a3a 100644
--- a/doc/reference/epiphany.types
+++ b/doc/reference/epiphany.types
@@ -17,3 +17,27 @@ ephy_location_entry_get_type
 ephy_zoom_action_get_type
 ephy_zoom_control_get_type
 ephy_cell_renderer_progress_get_type
+
+#include <ephy-embed.h>
+#include <downloader-view.h>
+#include <ephy-command-manager.h>
+#include <ephy-download.h>
+#include <ephy-embed-dialog.h>
+#include <ephy-embed-event.h>
+#include <ephy-embed-persist.h>
+
+ephy_embed_get_type
+downloader_view_get_type
+ephy_command_manager_get_type
+ephy_download_get_type
+ephy_embed_dialog_get_type
+ephy_embed_event_get_type
+ephy_embed_persist_get_type
+
+#include <ephy-window.h>
+#include <ephy-shell.h>
+#include <ephy-session.h>
+
+ephy_window_get_type
+ephy_shell_get_type
+ephy_session_get_type
diff --git a/doc/reference/tmpl/config.sgml b/doc/reference/tmpl/config.sgml
new file mode 100644
index 000000000..54b74acd4
--- /dev/null
+++ b/doc/reference/tmpl/config.sgml
@@ -0,0 +1,228 @@
+<!-- ##### SECTION Title ##### -->
+config
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO ENABLE_NAUTILUS_VIEW ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO ENABLE_NLS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GETTEXT_PACKAGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GNOME_ENABLE_DEBUG ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_BIND_TEXTDOMAIN_CODESET ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_DCGETTEXT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_DLFCN_H ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_GETTEXT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_INTTYPES_H ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_LC_MESSAGES ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_LOCALE_H ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_MEMORY_H ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_MOZILLA_PSM ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_STDINT_H ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_STDLIB_H ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_STRINGS_H ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_STRING_H ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_SYS_STAT_H ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_SYS_TYPES_H ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO HAVE_UNISTD_H ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO MOZILLA_SNAPSHOT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PACKAGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PACKAGE_BUGREPORT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PACKAGE_NAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PACKAGE_STRING ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PACKAGE_TARNAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PACKAGE_VERSION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO SHARE_UNINSTALLED_DIR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO STDC_HEADERS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO VERSION ##### -->
+<para>
+
+</para>
+
+
+
diff --git a/doc/reference/tmpl/ephy-session.sgml b/doc/reference/tmpl/ephy-session.sgml
new file mode 100644
index 000000000..03ba6989f
--- /dev/null
+++ b/doc/reference/tmpl/ephy-session.sgml
@@ -0,0 +1,91 @@
+<!-- ##### SECTION Title ##### -->
+ephy-session
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION ephy_session_get_active_window ##### -->
+<para>
+
+</para>
+
+@session: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_session_save ##### -->
+<para>
+
+</para>
+
+@session: 
+@filename: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_session_load ##### -->
+<para>
+
+</para>
+
+@session: 
+@filename: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_session_autoresume ##### -->
+<para>
+
+</para>
+
+@session: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_session_close ##### -->
+<para>
+
+</para>
+
+@session: 
+
+
+<!-- ##### FUNCTION ephy_session_get_windows ##### -->
+<para>
+
+</para>
+
+@session: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_session_add_window ##### -->
+<para>
+
+</para>
+
+@session: 
+@window: 
+
+
+<!-- ##### FUNCTION ephy_session_remove_window ##### -->
+<para>
+
+</para>
+
+@session: 
+@window: 
+
+
diff --git a/doc/reference/tmpl/ephy-shell.sgml b/doc/reference/tmpl/ephy-shell.sgml
new file mode 100644
index 000000000..176490882
--- /dev/null
+++ b/doc/reference/tmpl/ephy-shell.sgml
@@ -0,0 +1,192 @@
+<!-- ##### SECTION Title ##### -->
+ephy-shell
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO EPHY_SHELL_TYPE_DEF ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### VARIABLE ephy_shell ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO EPHY_SHELL_ERROR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### ENUM EphyShellError ##### -->
+<para>
+
+</para>
+
+@EPHY_SHELL_ERROR_MISSING_SERVER: 
+@EPHY_SHELL_ERROR_OBJECT_REG_FAILED: 
+@EPHY_SHELL_ERROR_FACTORY_REG_FAILED: 
+
+<!-- ##### ENUM EphyShellStartupFlags ##### -->
+<para>
+
+</para>
+
+@EPHY_SHELL_STARTUP_TABS: 
+@EPHY_SHELL_STARTUP_EXISTING_WINDOW: 
+@EPHY_SHELL_STARTUP_FULLSCREEN: 
+@EPHY_SHELL_STARTUP_BOOKMARKS_EDITOR: 
+@EPHY_SHELL_STARTUP_SESSION: 
+@EPHY_SHELL_STARTUP_IMPORT_BOOKMARKS: 
+@EPHY_SHELL_STARTUP_ADD_BOOKMARK: 
+@EPHY_SHELL_STARTUP_SERVER: 
+
+<!-- ##### ENUM EphyNewTabFlags ##### -->
+<para>
+
+</para>
+
+@EPHY_NEW_TAB_HOME_PAGE: 
+@EPHY_NEW_TAB_NEW_PAGE: 
+@EPHY_NEW_TAB_OPEN_PAGE: 
+@EPHY_NEW_TAB_FULLSCREEN_MODE: 
+@EPHY_NEW_TAB_APPEND_GROUPED: 
+@EPHY_NEW_TAB_APPEND_LAST: 
+@EPHY_NEW_TAB_APPEND_AFTER: 
+@EPHY_NEW_TAB_JUMP: 
+@EPHY_NEW_TAB_IN_NEW_WINDOW: 
+@EPHY_NEW_TAB_IN_EXISTING_WINDOW: 
+
+<!-- ##### FUNCTION ephy_shell_error_quark ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_shell_new ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_shell_startup ##### -->
+<para>
+
+</para>
+
+@gs: 
+@flags: 
+@args: 
+@string_arg: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_shell_get_active_window ##### -->
+<para>
+
+</para>
+
+@gs: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_shell_new_tab ##### -->
+<para>
+
+</para>
+
+@shell: 
+@parent_window: 
+@previous_tab: 
+@url: 
+@flags: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_shell_get_session ##### -->
+<para>
+
+</para>
+
+@gs: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_shell_get_bookmarks ##### -->
+<para>
+
+</para>
+
+@gs: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_shell_get_toolbars_model ##### -->
+<para>
+
+</para>
+
+@gs: 
+@fullscreen: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_shell_get_extensions_manager ##### -->
+<para>
+
+</para>
+
+@es: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_shell_get_bookmarks_editor ##### -->
+<para>
+
+</para>
+
+@gs: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_shell_get_history_window ##### -->
+<para>
+
+</para>
+
+@gs: 
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_shell_delete_on_exit ##### -->
+<para>
+
+</para>
+
+@gs: 
+@path: 
+
+
diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/doc/reference/tmpl/epiphany-unused.sgml
diff --git a/embed/Makefile.am b/embed/Makefile.am
index b4290efe6..30ff743e2 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -56,6 +56,3 @@ libephyembed_la_SOURCES = \
 	print-dialog.c			\
 	$(INST_H_FILES)			\
 	$(NOINST_H_FILES)
-
-libephyembed_la_LIBADD = \
-	$(top_builddir)/embed/mozilla/libephymozillaembed.la
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8215c81ac..285501655 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES += -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
 	-DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
 endif
 
-noinst_LTLIBRARIES = libephy.la
+noinst_LTLIBRARIES = libephymisc.la
 
 headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany
 header_DATA = $(INST_H_FILES)
@@ -40,7 +40,7 @@ INST_H_FILES = \
 	ephy-node.h				\
 	ephy-node-db.h
 
-libephy_la_SOURCES = \
+libephymisc_la_SOURCES = \
 	eel-gconf-extensions.c			\
 	ephy-bonobo-extensions.c		\
 	ephy-debug.c				\
@@ -69,10 +69,6 @@ libephy_la_SOURCES = \
 	$(INST_H_FILES)				\
 	$(NOINST_H_FILES)
 
-libephy_la_LIBADD = \
-	$(top_builddir)/lib/widgets/libephywidgets.la	\
-	$(top_builddir)/lib/egg/libegg.la
-
 BUILT_SOURCES=ephy-marshal.c ephy-marshal.h
 
 CLEAN_FILES = $(BUILT_SOURCES)
diff --git a/src/Makefile.am b/src/Makefile.am
index d30b39f7b..2762a4740 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,8 @@ INCLUDES += -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
 	-DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
 endif
 
+noinst_LTLIBRARIES = libephymain.la
+
 bin_PROGRAMS = epiphany-bin
 bin_SCRIPTS = epiphany
 
@@ -78,7 +80,7 @@ INST_H_FILES = 				    		\
 	ephy-tab.h					\
 	ephy-window.h
 
-epiphany_bin_SOURCES = 				    	\
+libephymain_la_SOURCES =				\
 	$(CORBA_SOURCE)				 	\
 	$(nautilus_view_sources)			\
 	ephy-automation.c				\
@@ -93,7 +95,6 @@ epiphany_bin_SOURCES = 				    	\
 	ephy-go-action.c				\
 	ephy-history-window.c				\
 	ephy-location-action.c				\
-	ephy-main.c					\
 	ephy-navigation-action.c			\
 	ephy-notebook.c					\
 	ephy-session.c					\
@@ -115,10 +116,16 @@ epiphany_bin_SOURCES = 				    	\
 	$(INST_H_FILES)					\
 	$(NOINST_H_FILES)
 
+epiphany_bin_SOURCES = ephy-main.c
+
 epiphany_bin_LDADD = \
-	$(top_builddir)/embed/libephyembed.la \
-	$(top_builddir)/lib/libephy.la \
+	$(top_builddir)/src/libephymain.la \
 	$(top_builddir)/src/bookmarks/libephybookmarks.la \
+	$(top_builddir)/embed/libephyembed.la \
+	$(top_builddir)/embed/mozilla/libephymozillaembed.la \
+	$(top_builddir)/lib/widgets/libephywidgets.la \
+	$(top_builddir)/lib/libephymisc.la \
+	$(top_builddir)/lib/egg/libegg.la \
 	$(MOZILLA_COMPONENT_LIBS)	\
 	$(EPIPHANY_DEPENDENCY_LIBS) \
 	$(INTLLIBS)
diff --git a/src/ephy-nautilus-view.c b/src/ephy-nautilus-view.c
index ad0cee8ca..14587ae3d 100644
--- a/src/ephy-nautilus-view.c
+++ b/src/ephy-nautilus-view.c
@@ -46,7 +46,6 @@ static void		gnv_embed_new_window_cb			(EphyEmbed *embed,
 								 EmbedChromeMask chromemask,
 								 EphyNautilusView *view);
 static void		gnv_embed_link_message_cb 		(EphyEmbed *embed, 
-								 const char *message,
 								 EphyNautilusView *view);
 static gint		gnv_embed_dom_mouse_click_cb		(EphyEmbed *embed,
 								 EphyEmbedEvent *event,