2003-07-13 Marco Pesenti Gritti <marco@it.gnome.org>

	* Makefile.am:
	* configure.in:
	* embed/Makefile.am:
	* embed/ephy-embed-shell.c: (ephy_embed_shell_get_favicon_cache),
	(impl_get_downloader_view):
	* embed/ephy-embed-shell.h:
	* embed/ephy-embed-single.c:
	* embed/ephy-embed-single.h:
	* embed/mozilla/ProgressListener.cpp:
	* embed/mozilla/mozilla-embed.cpp:
	* lib/Makefile.am:
	* lib/ephy-langs.h:
	* lib/ephy-node.c: (unref_signal_objects),
	(ephy_node_signal_connect_object):
	* plugins/Makefile.am:
	* plugins/sample/Makefile.am:
	* plugins/sample/sample.c: (bmk_added), (bmk_removed),
	(bmk_changed), (switch_page_cb), (window_focus_in_cb),
	(location_changed_cb), (tab_added_cb), (new_window_cb),
	(plugin_init):
	* src/Makefile.am:
	* src/bookmarks/Makefile.am:
	* src/bookmarks/ephy-bookmark-action.c:
	(ephy_bookmark_action_sync_icon):
	* src/bookmarks/ephy-bookmark-properties.c: (set_window_icon),
	(ephy_bookmark_properties_init):
	* src/bookmarks/ephy-bookmarks-editor.c: (provide_favicon),
	(ephy_bookmarks_editor_init):
	* src/bookmarks/ephy-bookmarks.c: (update_favorites_menus):
	* src/bookmarks/ephy-topic-action.c: (build_bookmarks_menu):
	* src/ephy-automation.c: (impl_ephy_automation_loadurl),
	(impl_ephy_automation_quit), (impl_ephy_automation_load_session):
	* src/ephy-favicon-action.c: (ephy_favicon_action_init):
	* src/ephy-history-window.c: (confirmation_dialog_response_cb),
	(provide_favicon):
	* src/ephy-location-action.c: (connect_proxy):
	* src/ephy-notebook.c: (sync_icon):
	* src/ephy-shell.c: (ephy_shell_get_active_window),
	(ephy_shell_get_session), (ephy_shell_get_autocompletion),
	(ephy_shell_get_toolbars_model):
	* src/ephy-shell.h:
	* src/ephy-tab.c: (ephy_tab_net_state_cb), (ephy_tab_init),
	(ephy_tab_get_action):
	* src/ephy-tab.h:
	* src/ephy-tabs-menu.c: (ephy_tabs_menu_update):
	* src/ephy-window.c: (ephy_window_fullscreen),
	(ephy_window_unfullscreen), (sync_tab_icon), (ephy_window_init),
	(remove_from_session), (ephy_window_get_active_tab):

6 files changed, 40 insertions, 19 deletions

diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 4425d0aa5..5b1865d31 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -17,24 +17,33 @@ INCLUDES = \
 
 noinst_LTLIBRARIES = libephybookmarks.la
 
+headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany
+header_DATA = $(INST_H_FILES)
+
+INST_H_FILES =		 	\
+	ephy-bookmarks.h
+
+NOINST_H_FILES =		 	\
+	ephy-bookmark-action.h		\
+	ephy-bookmarks-editor.h		\
+	ephy-bookmarks-export.h		\
+	ephy-bookmarks-import.h		\
+	ephy-bookmarks-menu.h		\
+	ephy-bookmark-properties.h	\
+	ephy-new-bookmark.h		\
+	ephy-topic-action.h		\
+	ephy-topics-selector.h
+
 libephybookmarks_la_SOURCES = 		\
 	ephy-bookmarks.c		\
-	ephy-bookmarks.h		\
 	ephy-bookmark-action.c		\
-	ephy-bookmark-action.h		\
 	ephy-bookmarks-editor.c		\
-	ephy-bookmarks-editor.h		\
 	ephy-bookmarks-export.c		\
-	ephy-bookmarks-export.h		\
 	ephy-bookmarks-import.c 	\
-	ephy-bookmarks-import.h		\
 	ephy-bookmarks-menu.c		\
-	ephy-bookmarks-menu.h		\
 	ephy-bookmark-properties.c	\
-	ephy-bookmark-properties.h	\
 	ephy-new-bookmark.c		\
-	ephy-new-bookmark.h		\
 	ephy-topic-action.c		\
-	ephy-topic-action.h		\
 	ephy-topics-selector.c  	\
-	ephy-topics-selector.h
+	$(NOINST_H_FILES)		\
+	$(INST_H_FILES)
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index c768af3cb..42aa5cac4 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -25,6 +25,7 @@
 
 #include "ephy-bookmark-action.h"
 #include "ephy-bookmarks.h"
+#include "ephy-favicon-cache.h"
 #include "ephy-shell.h"
 #include "ephy-string.h"
 #include "eggtoolitem.h"
@@ -161,8 +162,8 @@ ephy_bookmark_action_sync_icon (EggAction *action, GParamSpec *pspec, GtkWidget
 
 	icon_location = EPHY_BOOKMARK_ACTION (action)->priv->icon;
 
-	cache = ephy_embed_shell_get_favicon_cache
-		(EPHY_EMBED_SHELL (ephy_shell));
+	cache = EPHY_FAVICON_CACHE (ephy_embed_shell_get_favicon_cache
+		(EPHY_EMBED_SHELL (ephy_shell)));
 
 	if (icon_location)
 	{
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 1e0ae60e9..9fda1cfea 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -21,12 +21,14 @@
 #include <config.h>
 #endif
 
+#include "ephy-toolbars-model.h"
 #include "ephy-bookmark-properties.h"
 #include "ephy-topics-selector.h"
 #include "ephy-debug.h"
 #include "ephy-shell.h"
 #include "ephy-state.h"
 #include "ephy-gui.h"
+#include "ephy-favicon-cache.h"
 
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtktogglebutton.h>
@@ -294,7 +296,8 @@ set_window_icon (EphyBookmarkProperties *editor)
 	const char *icon_location;
 	GdkPixbuf *icon = NULL;
 
-	cache = ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell));
+	cache = EPHY_FAVICON_CACHE
+		(ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell)));
 	icon_location = ephy_node_get_property_string
 		(editor->priv->bookmark, EPHY_NODE_BMK_PROP_ICON);
 
@@ -440,7 +443,8 @@ ephy_bookmark_properties_init (EphyBookmarkProperties *editor)
 	editor->priv = g_new0 (EphyBookmarkPropertiesPrivate, 1);
 
 	editor->priv->bookmark = NULL;
-	editor->priv->tb_model = ephy_shell_get_toolbars_model (ephy_shell);
+	editor->priv->tb_model = EPHY_TOOLBARS_MODEL
+		(ephy_shell_get_toolbars_model (ephy_shell));
 }
 
 GtkWidget *
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 490de4f86..900e576ba 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -55,6 +55,8 @@
 #include "ephy-gui.h"
 #include "ephy-stock-icons.h"
 #include "ephy-search-entry.h"
+#include "ephy-toolbars-model.h"
+#include "ephy-favicon-cache.h"
 
 static GtkTargetEntry topic_drag_dest_types [] =
 {
@@ -1161,7 +1163,8 @@ provide_favicon (EphyNode *node, GValue *value, gpointer user_data)
 	const char *icon_location;
 	GdkPixbuf *pixbuf = NULL;
 
-	cache = ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell));
+	cache = EPHY_FAVICON_CACHE
+		(ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell)));
 	icon_location = ephy_node_get_property_string
 		(node, EPHY_NODE_BMK_PROP_ICON);
 
@@ -1453,7 +1456,8 @@ ephy_bookmarks_editor_init (EphyBookmarksEditor *editor)
 
 	editor->priv->props_dialogs = g_hash_table_new (g_direct_hash,
                                                         g_direct_equal);
-	editor->priv->tb_model = ephy_shell_get_toolbars_model (ephy_shell);
+	editor->priv->tb_model = EPHY_TOOLBARS_MODEL
+		(ephy_shell_get_toolbars_model (ephy_shell));
 
 	g_signal_connect (editor->priv->tb_model, "item_added",
 			  G_CALLBACK (toolbar_items_changed_cb), editor);
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 757b2f3b3..82b937543 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -32,6 +32,8 @@
 #include "ephy-toolbars-model.h"
 #include "ephy-bookmarks-export.h"
 #include "ephy-bookmarks-import.h"
+#include "ephy-autocompletion.h"
+#include "session.h"
 
 #include <string.h>
 #include <bonobo/bonobo-i18n.h>
@@ -518,7 +520,7 @@ update_favorites_menus ()
 	Session *session;
 	const GList *l;
 
-	session = ephy_shell_get_session (ephy_shell);
+	session = SESSION (ephy_shell_get_session (ephy_shell));
 	l = session_get_windows (session);
 
 	for (; l != NULL; l = l->next)
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 344010989..e2cb0adfa 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -25,6 +25,7 @@
 #include "ephy-node-common.h"
 #include "ephy-topic-action.h"
 #include "ephy-bookmarks.h"
+#include "ephy-favicon-cache.h"
 #include "ephy-shell.h"
 #include "eggtoolitem.h"
 #include "ephy-debug.h"
@@ -199,8 +200,8 @@ build_bookmarks_menu (EphyTopicAction *action, EphyNode *node)
 
 	menu = gtk_menu_new ();
 
-        cache = ephy_embed_shell_get_favicon_cache
-               (EPHY_EMBED_SHELL (ephy_shell));
+        cache = EPHY_FAVICON_CACHE
+		(ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell)));
 
 	children = ephy_node_get_children (node);