Don't reference private objects from public headers. Fixes bug #153766.

2004-09-27  Christian Persch  <chpe@cvs.gnome.org>

	* lib/egg/Makefile.am:
	* src/bookmarks/ephy-bookmark-action.c: (remove_from_model),
	(move_in_model):
	* src/bookmarks/ephy-bookmarks.c:
	(ephy_bookmarks_get_toolbars_model):
	* src/bookmarks/ephy-bookmarks.h:
	* src/bookmarks/ephy-bookmarksbar.c:
	(ephy_bookmarksbar_set_property):
	* src/bookmarks/ephy-topic-action.c: (remove_from_model),
	(move_in_model):
	* src/ephy-shell.c: (ephy_shell_get_toolbars_model):

	Don't reference private objects from public headers. Fixes bug #153766.

8 files changed, 32 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index e2a0fc31e..96479831a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2004-09-27  Christian Persch  <chpe@cvs.gnome.org>
 
+	* lib/egg/Makefile.am:
+	* src/bookmarks/ephy-bookmark-action.c: (remove_from_model),
+	(move_in_model):
+	* src/bookmarks/ephy-bookmarks.c:
+	(ephy_bookmarks_get_toolbars_model):
+	* src/bookmarks/ephy-bookmarks.h:
+	* src/bookmarks/ephy-bookmarksbar.c:
+	(ephy_bookmarksbar_set_property):
+	* src/bookmarks/ephy-topic-action.c: (remove_from_model),
+	(move_in_model):
+	* src/ephy-shell.c: (ephy_shell_get_toolbars_model):
+
+	Don't reference private objects from public headers. Fixes bug #153766.
+
+2004-09-27  Christian Persch  <chpe@cvs.gnome.org>
+
 	* configure.ac:
 	* lib/ephy-debug.c: (trap_handler), (ephy_debug_init):
 
diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am
index f6853f664..7d2471e68 100644
--- a/lib/egg/Makefile.am
+++ b/lib/egg/Makefile.am
@@ -21,9 +21,7 @@ libegg_la_SOURCES = \
   $(EGGSOURCES) \
   eggmarshalers.c
 
-INST_H_FILES =
-
-NOINST_H_FILES = \
+EGGHEADERS = \
   eggdropdowntoolbutton.h \
   eggtreemultidnd.h \
   egg-editable-toolbar.h \
@@ -31,13 +29,13 @@ NOINST_H_FILES = \
   egg-toolbar-editor.h \
   eggstatusicon.h \
   eggtrayicon.h \
-  eggtraymanager.h \
+  eggtraymanager.h
+
+noinst_HEADERS = \
+  $(EGGHEADERS) \
   eggmarshalers.h \
   eggintl.h
 
-headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany
-header_DATA = $(INST_H_FILES)
-
 BUILT_SOURCES = eggmarshalers.h eggmarshalers.c
 
 eggmarshalers.h: eggmarshalers.list
@@ -57,7 +55,7 @@ egg-marshal.c: eggmarshalers.h eggmarshalers.c
 EXTRA_DIST=			\
 	eggmarshalers.list
 
-EGGFILES=$(EGGSOURCES) $(INST_H_FILES) $(NOINST_H_FILES)
+EGGFILES=$(EGGSOURCES) $(EGGHEADERS)
 EGGDIR=$(srcdir)/../../../libegg/libegg
 
 regenerate-built-sources:
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 52dad678b..6a3f2dc02 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -433,7 +433,7 @@ remove_from_model (GtkWidget *widget)
 	pos = get_item_position (widget, NULL);
 
 	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-	model = ephy_bookmarks_get_toolbars_model (bookmarks);
+	model = EGG_TOOLBARS_MODEL (ephy_bookmarks_get_toolbars_model (bookmarks));
 
 	egg_toolbars_model_remove_item (model, 0, pos);
 }
@@ -446,7 +446,7 @@ move_in_model (GtkWidget *widget, int direction)
 	int pos, new_pos;
 
 	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-	model = ephy_bookmarks_get_toolbars_model (bookmarks);
+	model = EGG_TOOLBARS_MODEL (ephy_bookmarks_get_toolbars_model (bookmarks));
 
 	pos = get_item_position (widget, NULL);
 	new_pos = MAX (0, pos + direction);
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 1a371d62b..ff351272d 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -207,7 +207,7 @@ get_item_data_forward_cb (EggToolbarsModel *model,
 	return retval;
 }
 
-EggToolbarsModel *
+GObject *
 ephy_bookmarks_get_toolbars_model (EphyBookmarks *eb)
 {
 	g_return_val_if_fail (EPHY_IS_BOOKMARKS (eb), NULL);
@@ -240,7 +240,7 @@ ephy_bookmarks_get_toolbars_model (EphyBookmarks *eb)
 		}
 	}
 
-	return EGG_TOOLBARS_MODEL (eb->priv->toolbars_model);
+	return G_OBJECT (eb->priv->toolbars_model);
 }
 
 static void
diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h
index 78e240c48..5bf2845af 100644
--- a/src/bookmarks/ephy-bookmarks.h
+++ b/src/bookmarks/ephy-bookmarks.h
@@ -25,7 +25,6 @@
 #include <glib-object.h>
 
 #include "ephy-node.h"
-#include "egg-toolbars-model.h"
 
 G_BEGIN_DECLS
 
@@ -74,7 +73,7 @@ EphyBookmarks    *ephy_bookmarks_new			(void);
 EphyNode	 *ephy_bookmarks_get_from_id		(EphyBookmarks *eb,
 							 long id);
 
-EggToolbarsModel *ephy_bookmarks_get_toolbars_model	(EphyBookmarks *eb);
+GObject		 *ephy_bookmarks_get_toolbars_model	(EphyBookmarks *eb);
 
 /* Bookmarks */
 
diff --git a/src/bookmarks/ephy-bookmarksbar.c b/src/bookmarks/ephy-bookmarksbar.c
index 9e0fecff9..519244ecb 100644
--- a/src/bookmarks/ephy-bookmarksbar.c
+++ b/src/bookmarks/ephy-bookmarksbar.c
@@ -356,7 +356,7 @@ ephy_bookmarksbar_set_property (GObject *object,
 		case PROP_BOOKMARKS:
 			toolbar->priv->bookmarks = g_value_get_object (value);
 			toolbar->priv->toolbars_model =
-				ephy_bookmarks_get_toolbars_model (toolbar->priv->bookmarks);
+				EGG_TOOLBARS_MODEL (ephy_bookmarks_get_toolbars_model (toolbar->priv->bookmarks));
 			break;
 		case PROP_WINDOW:
 			ephy_bookmarksbar_set_window (toolbar, g_value_get_object (value));
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 4905b39a6..601bd11f8 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -397,7 +397,7 @@ remove_from_model (GtkWidget *widget)
 	pos = get_item_position (widget, NULL);
 
 	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-	model = ephy_bookmarks_get_toolbars_model (bookmarks);
+	model = EGG_TOOLBARS_MODEL (ephy_bookmarks_get_toolbars_model (bookmarks));
 
 	egg_toolbars_model_remove_item (model, 0, pos);
 }
@@ -410,7 +410,7 @@ move_in_model (GtkWidget *widget, int direction)
 	int pos, new_pos;
 
 	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-	model = ephy_bookmarks_get_toolbars_model (bookmarks);
+	model = EGG_TOOLBARS_MODEL (ephy_bookmarks_get_toolbars_model (bookmarks));
 
 	pos = get_item_position (widget, NULL);
 	new_pos = MAX (0, pos + direction);
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 8b67e3d40..b63f49e21 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -656,7 +656,7 @@ ephy_shell_get_toolbars_model (EphyShell *shell, gboolean fullscreen)
 		if (shell->priv->toolbars_model == NULL)
 		{
 			EphyBookmarks *bookmarks;
-			EggToolbarsModel *bookmarksbar_model;
+			GObject *bookmarksbar_model;
 
 			shell->priv->toolbars_model = ephy_toolbars_model_new ();
 
@@ -669,7 +669,7 @@ ephy_shell_get_toolbars_model (EphyShell *shell, gboolean fullscreen)
 
 			/* ok, now we can load the model */
 			ephy_toolbars_model_load
-			(EPHY_TOOLBARS_MODEL (shell->priv->toolbars_model));
+				(EPHY_TOOLBARS_MODEL (shell->priv->toolbars_model));
 		}
 
 		return G_OBJECT (shell->priv->toolbars_model);