From a913abc0b33ea25f706d5ebf6e98626d31da39d5 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 27 Sep 2004 18:13:11 +0000 Subject: Don't reference private objects from public headers. Fixes bug #153766. 2004-09-27 Christian Persch * 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. --- lib/egg/Makefile.am | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lib/egg') 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: -- cgit v1.2.3