epiphany r8210 - in trunk/src: . bookmarks

From: chpe svn gnome org
To: svn-commits-list gnome org
Subject: epiphany r8210 - in trunk/src: . bookmarks
Date: Fri, 11 Apr 2008 21:05:26 +0100 (BST)
Author: chpe
Date: Fri Apr 11 21:05:25 2008
New Revision: 8210
URL: http://svn.gnome.org/viewvc/epiphany?rev=8210&view=rev

Log:
Add epiphany.h.
Only allow including epiphany/epiphany.h; all other headers are internal.


Added:
   trunk/src/epiphany.h.in
      - copied, changed from r8209, /trunk/src/ephy-version.h.in
Removed:
   trunk/src/ephy-version.h.in
Modified:
   trunk/src/Makefile.am
   trunk/src/bookmarks/Makefile.am
   trunk/src/bookmarks/ephy-bookmark-action-group.h
   trunk/src/bookmarks/ephy-bookmark-action.h
   trunk/src/bookmarks/ephy-bookmark-factory-action.h
   trunk/src/bookmarks/ephy-bookmark-properties.h
   trunk/src/bookmarks/ephy-bookmarks-editor.h
   trunk/src/bookmarks/ephy-bookmarks-export.h
   trunk/src/bookmarks/ephy-bookmarks-import.h
   trunk/src/bookmarks/ephy-bookmarks-menu.h
   trunk/src/bookmarks/ephy-bookmarks-ui.h
   trunk/src/bookmarks/ephy-bookmarks.h
   trunk/src/bookmarks/ephy-nodes-cover.h
   trunk/src/bookmarks/ephy-open-tabs-action.h
   trunk/src/bookmarks/ephy-related-action.h
   trunk/src/bookmarks/ephy-topic-action-group.h
   trunk/src/bookmarks/ephy-topic-action.h
   trunk/src/bookmarks/ephy-topic-factory-action.h
   trunk/src/bookmarks/ephy-topics-entry.h
   trunk/src/bookmarks/ephy-topics-palette.h
   trunk/src/ephy-action-helper.h
   trunk/src/ephy-activation.h
   trunk/src/ephy-completion-model.h
   trunk/src/ephy-dbus.h
   trunk/src/ephy-encoding-dialog.h
   trunk/src/ephy-encoding-menu.h
   trunk/src/ephy-extension.h
   trunk/src/ephy-extensions-manager.h
   trunk/src/ephy-find-toolbar.h
   trunk/src/ephy-fullscreen-popup.h
   trunk/src/ephy-go-action.h
   trunk/src/ephy-history-window.h
   trunk/src/ephy-home-action.h
   trunk/src/ephy-link-action.h
   trunk/src/ephy-link.h
   trunk/src/ephy-location-action.h
   trunk/src/ephy-lockdown.h
   trunk/src/ephy-navigation-action.h
   trunk/src/ephy-net-monitor.h
   trunk/src/ephy-notebook.h
   trunk/src/ephy-python-extension.h
   trunk/src/ephy-python-loader.h
   trunk/src/ephy-python.h
   trunk/src/ephy-session.h
   trunk/src/ephy-shell.h
   trunk/src/ephy-statusbar.h
   trunk/src/ephy-tabs-menu.h
   trunk/src/ephy-toolbar-editor.h
   trunk/src/ephy-toolbar.h
   trunk/src/ephy-toolbars-model.h
   trunk/src/ephy-window.h
   trunk/src/epiphany.override

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Apr 11 21:05:25 2008
@@ -52,7 +52,7 @@
 	ephy-shell.h			\
 	ephy-statusbar.h		\
 	ephy-window.h			\
-	ephy-version.h                  \
+	epiphany.h			\
 	$(NULL)
 
 libephymain_la_SOURCES = \
@@ -259,6 +259,7 @@
 	@true
 stamp-ephy-type-builtins.c: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
 	$(GLIB_MKENUMS) \
+		--fhead "#include <config.h>\n\n" \
 		--fhead "#include \"ephy-type-builtins.h\"\n\n" \
 		--fprod "\n/* enumerations from \"@filename \" */" \
 		--fprod "\n#include \"@filename \"" \
@@ -279,6 +280,9 @@
 	@true
 stamp-ephy-type-builtins.h: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
 	$(GLIB_MKENUMS) \
+		--fhead "#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)\n" \
+		--fhead "#error Only <epiphany/epiphany.h> can be included directly.\n" \
+		--fhead "#endif\n\n" \
 		--fhead "#ifndef EPHY_TYPE_BUILTINS_H\n" \
 		--fhead "#define EPHY_TYPE_BUILTINS_H 1\n\n" \
 		--fhead "#include <glib-object.h>\n\n" \

Modified: trunk/src/bookmarks/Makefile.am
==============================================================================
--- trunk/src/bookmarks/Makefile.am	(original)
+++ trunk/src/bookmarks/Makefile.am	Fri Apr 11 21:05:25 2008
@@ -66,6 +66,7 @@
 	@true
 stamp-ephy-bookmarks-type-builtins.c: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
 	$(GLIB_MKENUMS) \
+		--fhead "#include <config.h>\n\n" \
 		--fhead "#include \"ephy-bookmarks-type-builtins.h\"\n\n" \
 		--fprod "\n/* enumerations from \"@filename \" */" \
 		--fprod "\n#include \"@filename \"" \
@@ -86,6 +87,9 @@
 	@true
 stamp-ephy-bookmarks-type-builtins.h: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
 	$(GLIB_MKENUMS) \
+		--fhead "#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)\n" \
+		--fhead "#error Only <epiphany/epiphany.h> can be included directly.\n" \
+		--fhead "#endif\n\n" \
 		--fhead "#ifndef EPHY_BOOKMARKS_TYPE_BUILTINS_H\n" \
 		--fhead "#define EPHY_BOOKMARKS_TYPE_BUILTINS_H 1\n\n" \
 		--fhead "#include <glib-object.h>\n\n" \

Modified: trunk/src/bookmarks/ephy-bookmark-action-group.h
==============================================================================
--- trunk/src/bookmarks/ephy-bookmark-action-group.h	(original)
+++ trunk/src/bookmarks/ephy-bookmark-action-group.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_BOOKMARK_ACTION_GROUP_H
 #define EPHY_BOOKMARK_ACTION_GROUP_H
 

Modified: trunk/src/bookmarks/ephy-bookmark-action.h
==============================================================================
--- trunk/src/bookmarks/ephy-bookmark-action.h	(original)
+++ trunk/src/bookmarks/ephy-bookmark-action.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_BOOKMARK_ACTION_H
 #define EPHY_BOOKMARK_ACTION_H
 

Modified: trunk/src/bookmarks/ephy-bookmark-factory-action.h
==============================================================================
--- trunk/src/bookmarks/ephy-bookmark-factory-action.h	(original)
+++ trunk/src/bookmarks/ephy-bookmark-factory-action.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_BOOKMARK_FACTORY_ACTION_H
 #define EPHY_BOOKMARK_FACTORY_ACTION_H
 

Modified: trunk/src/bookmarks/ephy-bookmark-properties.h
==============================================================================
--- trunk/src/bookmarks/ephy-bookmark-properties.h	(original)
+++ trunk/src/bookmarks/ephy-bookmark-properties.h	Fri Apr 11 21:05:25 2008
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_BOOKMARK_PROPERTIES_H
 #define EPHY_BOOKMARK_PROPERTIES_H
 

Modified: trunk/src/bookmarks/ephy-bookmarks-editor.h
==============================================================================
--- trunk/src/bookmarks/ephy-bookmarks-editor.h	(original)
+++ trunk/src/bookmarks/ephy-bookmarks-editor.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_BOOKMARKS_EDITOR_H
 #define EPHY_BOOKMARKS_EDITOR_H
 

Modified: trunk/src/bookmarks/ephy-bookmarks-export.h
==============================================================================
--- trunk/src/bookmarks/ephy-bookmarks-export.h	(original)
+++ trunk/src/bookmarks/ephy-bookmarks-export.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_BOOKMARKS_EXPORT_H
 #define EPHY_BOOKMARKS_EXPORT_H
 

Modified: trunk/src/bookmarks/ephy-bookmarks-import.h
==============================================================================
--- trunk/src/bookmarks/ephy-bookmarks-import.h	(original)
+++ trunk/src/bookmarks/ephy-bookmarks-import.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_BOOKMARKS_IMPORT_H
 #define EPHY_BOOKMARKS_IMPORT_H
 

Modified: trunk/src/bookmarks/ephy-bookmarks-menu.h
==============================================================================
--- trunk/src/bookmarks/ephy-bookmarks-menu.h	(original)
+++ trunk/src/bookmarks/ephy-bookmarks-menu.h	Fri Apr 11 21:05:25 2008
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_BOOKMARKS_MENU_H
 #define EPHY_BOOKMARKS_MENU_H
 

Modified: trunk/src/bookmarks/ephy-bookmarks-ui.h
==============================================================================
--- trunk/src/bookmarks/ephy-bookmarks-ui.h	(original)
+++ trunk/src/bookmarks/ephy-bookmarks-ui.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_BOOKMARKS_UI_H
 #define EPHY_BOOKMARKS_UI_H
 

Modified: trunk/src/bookmarks/ephy-bookmarks.h
==============================================================================
--- trunk/src/bookmarks/ephy-bookmarks.h	(original)
+++ trunk/src/bookmarks/ephy-bookmarks.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_BOOKMARKS_H
 #define EPHY_BOOKMARKS_H
 

Modified: trunk/src/bookmarks/ephy-nodes-cover.h
==============================================================================
--- trunk/src/bookmarks/ephy-nodes-cover.h	(original)
+++ trunk/src/bookmarks/ephy-nodes-cover.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_NODES_COVER_H
 #define EPHY_NODES_COVER_H
 

Modified: trunk/src/bookmarks/ephy-open-tabs-action.h
==============================================================================
--- trunk/src/bookmarks/ephy-open-tabs-action.h	(original)
+++ trunk/src/bookmarks/ephy-open-tabs-action.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_OPEN_TABS_ACTION_H
 #define EPHY_OPEN_TABS_ACTION_H
 

Modified: trunk/src/bookmarks/ephy-related-action.h
==============================================================================
--- trunk/src/bookmarks/ephy-related-action.h	(original)
+++ trunk/src/bookmarks/ephy-related-action.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_RELATED_ACTION_H
 #define EPHY_RELATED_ACTION_H
 

Modified: trunk/src/bookmarks/ephy-topic-action-group.h
==============================================================================
--- trunk/src/bookmarks/ephy-topic-action-group.h	(original)
+++ trunk/src/bookmarks/ephy-topic-action-group.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_TOPIC_ACTION_GROUP_H
 #define EPHY_TOPIC_ACTION_GROUP_H
 

Modified: trunk/src/bookmarks/ephy-topic-action.h
==============================================================================
--- trunk/src/bookmarks/ephy-topic-action.h	(original)
+++ trunk/src/bookmarks/ephy-topic-action.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_TOPIC_ACTION_H
 #define EPHY_TOPIC_ACTION_H
 

Modified: trunk/src/bookmarks/ephy-topic-factory-action.h
==============================================================================
--- trunk/src/bookmarks/ephy-topic-factory-action.h	(original)
+++ trunk/src/bookmarks/ephy-topic-factory-action.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_TOPIC_FACTORY_ACTION_H
 #define EPHY_TOPIC_FACTORY_ACTION_H
 

Modified: trunk/src/bookmarks/ephy-topics-entry.h
==============================================================================
--- trunk/src/bookmarks/ephy-topics-entry.h	(original)
+++ trunk/src/bookmarks/ephy-topics-entry.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_TOPICS_ENTRY_H
 #define EPHY_TOPICS_ENTRY_H
 

Modified: trunk/src/bookmarks/ephy-topics-palette.h
==============================================================================
--- trunk/src/bookmarks/ephy-topics-palette.h	(original)
+++ trunk/src/bookmarks/ephy-topics-palette.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_TOPICS_PALETTE_H
 #define EPHY_TOPICS_PALETTE_H
 

Modified: trunk/src/ephy-action-helper.h
==============================================================================
--- trunk/src/ephy-action-helper.h	(original)
+++ trunk/src/ephy-action-helper.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_ACTION_HELPER_H
 #define EPHY_ACTION_HELPER_H
 

Modified: trunk/src/ephy-activation.h
==============================================================================
--- trunk/src/ephy-activation.h	(original)
+++ trunk/src/ephy-activation.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_ACTIVATION_H
 #define EPHY_ACTIVATION_H
 

Modified: trunk/src/ephy-completion-model.h
==============================================================================
--- trunk/src/ephy-completion-model.h	(original)
+++ trunk/src/ephy-completion-model.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_COMPLETION_MODEL_H
 #define EPHY_COMPLETION_MODEL_H
 

Modified: trunk/src/ephy-dbus.h
==============================================================================
--- trunk/src/ephy-dbus.h	(original)
+++ trunk/src/ephy-dbus.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_DBUS_H
 #define EPHY_DBUS_H
 

Modified: trunk/src/ephy-encoding-dialog.h
==============================================================================
--- trunk/src/ephy-encoding-dialog.h	(original)
+++ trunk/src/ephy-encoding-dialog.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_ENCODING_DIALOG_H
 #define EPHY_ENCODING_DIALOG_H
 

Modified: trunk/src/ephy-encoding-menu.h
==============================================================================
--- trunk/src/ephy-encoding-menu.h	(original)
+++ trunk/src/ephy-encoding-menu.h	Fri Apr 11 21:05:25 2008
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_ENCODING_MENU_H
 #define EPHY_ENCODING_MENU_H
 

Modified: trunk/src/ephy-extension.h
==============================================================================
--- trunk/src/ephy-extension.h	(original)
+++ trunk/src/ephy-extension.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EXTENSION_H
 #define EPHY_EXTENSION_H
 

Modified: trunk/src/ephy-extensions-manager.h
==============================================================================
--- trunk/src/ephy-extensions-manager.h	(original)
+++ trunk/src/ephy-extensions-manager.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EXTENSIONS_MANAGER_H
 #define EPHY_EXTENSIONS_MANAGER_H
 

Modified: trunk/src/ephy-find-toolbar.h
==============================================================================
--- trunk/src/ephy-find-toolbar.h	(original)
+++ trunk/src/ephy-find-toolbar.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_FIND_TOOLBAR_H
 #define EPHY_FIND_TOOLBAR_H
 

Modified: trunk/src/ephy-fullscreen-popup.h
==============================================================================
--- trunk/src/ephy-fullscreen-popup.h	(original)
+++ trunk/src/ephy-fullscreen-popup.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_FULLSCREEN_POPUP_H
 #define EPHY_FULLSCREEN_POPUP_H
 

Modified: trunk/src/ephy-go-action.h
==============================================================================
--- trunk/src/ephy-go-action.h	(original)
+++ trunk/src/ephy-go-action.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_GO_ACTION_H
 #define EPHY_GO_ACTION_H
 

Modified: trunk/src/ephy-history-window.h
==============================================================================
--- trunk/src/ephy-history-window.h	(original)
+++ trunk/src/ephy-history-window.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_HISTORY_WINDOW_H
 #define EPHY_HISTORY_WINDOW_H
 

Modified: trunk/src/ephy-home-action.h
==============================================================================
--- trunk/src/ephy-home-action.h	(original)
+++ trunk/src/ephy-home-action.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_HOME_ACTION_H
 #define EPHY_HOME_ACTION_H
 

Modified: trunk/src/ephy-link-action.h
==============================================================================
--- trunk/src/ephy-link-action.h	(original)
+++ trunk/src/ephy-link-action.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_LINK_ACTION_H
 #define EPHY_LINK_ACTION_H
 

Modified: trunk/src/ephy-link.h
==============================================================================
--- trunk/src/ephy-link.h	(original)
+++ trunk/src/ephy-link.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_LINK_H
 #define EPHY_LINK_H
 

Modified: trunk/src/ephy-location-action.h
==============================================================================
--- trunk/src/ephy-location-action.h	(original)
+++ trunk/src/ephy-location-action.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_LOCATION_ACTION_H
 #define EPHY_LOCATION_ACTION_H
 

Modified: trunk/src/ephy-lockdown.h
==============================================================================
--- trunk/src/ephy-lockdown.h	(original)
+++ trunk/src/ephy-lockdown.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_LOCKDOWN_H
 #define EPHY_LOCKDOWN_H
 

Modified: trunk/src/ephy-navigation-action.h
==============================================================================
--- trunk/src/ephy-navigation-action.h	(original)
+++ trunk/src/ephy-navigation-action.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_NAVIGATION_ACTION_H
 #define EPHY_NAVIGATION_ACTION_H
 

Modified: trunk/src/ephy-net-monitor.h
==============================================================================
--- trunk/src/ephy-net-monitor.h	(original)
+++ trunk/src/ephy-net-monitor.h	Fri Apr 11 21:05:25 2008
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_NET_MONITOR_H
 #define EPHY_NET_MONITOR_H
 

Modified: trunk/src/ephy-notebook.h
==============================================================================
--- trunk/src/ephy-notebook.h	(original)
+++ trunk/src/ephy-notebook.h	Fri Apr 11 21:05:25 2008
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_NOTEBOOK_H
 #define EPHY_NOTEBOOK_H
 

Modified: trunk/src/ephy-python-extension.h
==============================================================================
--- trunk/src/ephy-python-extension.h	(original)
+++ trunk/src/ephy-python-extension.h	Fri Apr 11 21:05:25 2008
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_PYTHON_EXTENSION_H
 #define EPHY_PYTHON_EXTENSION_H
 

Modified: trunk/src/ephy-python-loader.h
==============================================================================
--- trunk/src/ephy-python-loader.h	(original)
+++ trunk/src/ephy-python-loader.h	Fri Apr 11 21:05:25 2008
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_PYTHON_LOADER_H
 #define EPHY_PYTHON_LOADER_H
 

Modified: trunk/src/ephy-python.h
==============================================================================
--- trunk/src/ephy-python.h	(original)
+++ trunk/src/ephy-python.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_PYTHON_H
 #define EPHY_PYTHON_H
 

Modified: trunk/src/ephy-session.h
==============================================================================
--- trunk/src/ephy-session.h	(original)
+++ trunk/src/ephy-session.h	Fri Apr 11 21:05:25 2008
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_SESSION_H
 #define EPHY_SESSION_H
 

Modified: trunk/src/ephy-shell.h
==============================================================================
--- trunk/src/ephy-shell.h	(original)
+++ trunk/src/ephy-shell.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_SHELL_H
 #define EPHY_SHELL_H
 

Modified: trunk/src/ephy-statusbar.h
==============================================================================
--- trunk/src/ephy-statusbar.h	(original)
+++ trunk/src/ephy-statusbar.h	Fri Apr 11 21:05:25 2008
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_STATUSBAR_H
 #define EPHY_STATUSBAR_H
 

Modified: trunk/src/ephy-tabs-menu.h
==============================================================================
--- trunk/src/ephy-tabs-menu.h	(original)
+++ trunk/src/ephy-tabs-menu.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_TABS_MENU_H
 #define EPHY_TABS_MENU_H
 

Modified: trunk/src/ephy-toolbar-editor.h
==============================================================================
--- trunk/src/ephy-toolbar-editor.h	(original)
+++ trunk/src/ephy-toolbar-editor.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_TOOLBAR_EDITOR_H
 #define EPHY_TOOLBAR_EDITOR_H
 

Modified: trunk/src/ephy-toolbar.h
==============================================================================
--- trunk/src/ephy-toolbar.h	(original)
+++ trunk/src/ephy-toolbar.h	Fri Apr 11 21:05:25 2008
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_TOOLBAR_H
 #define EPHY_TOOLBAR_H
 

Modified: trunk/src/ephy-toolbars-model.h
==============================================================================
--- trunk/src/ephy-toolbars-model.h	(original)
+++ trunk/src/ephy-toolbars-model.h	Fri Apr 11 21:05:25 2008
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_TOOLBARS_MODEL_H
 #define EPHY_TOOLBARS_MODEL_H
 

Modified: trunk/src/ephy-window.h
==============================================================================
--- trunk/src/ephy-window.h	(original)
+++ trunk/src/ephy-window.h	Fri Apr 11 21:05:25 2008
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_WINDOW_H
 #define EPHY_WINDOW_H
 

Copied: trunk/src/epiphany.h.in (from r8209, /trunk/src/ephy-version.h.in)
==============================================================================
--- /trunk/src/ephy-version.h.in	(original)
+++ trunk/src/epiphany.h.in	Fri Apr 11 21:05:25 2008
@@ -17,11 +17,12 @@
  *
  */
 
-#ifndef __EPHY_VERSION_H__
-#define __EPHY_VERSION_H__
+#ifndef __EPIPHANY_H__
+#define __EPIPHANY_H__
 
-/* From GTK_CHECK_VERSION */
+#define __EPHY_EPIPHANY_H_INSIDE__
 
+/* From GTK_CHECK_VERSION */
 #define EPHY_MAJOR_VERSION (@EPIPHANY_MAJOR_VERSION@)
 #define EPHY_MINOR_VERSION (@EPIPHANY_MINOR_VERSION@)
 #define EPHY_MICRO_VERSION (@EPIPHANY_MICRO_VERSION@)
@@ -32,4 +33,43 @@
     (EPHY_MAJOR_VERSION == (major) && EPHY_MINOR_VERSION == (minor) && \
      EPHY_MICRO_VERSION >= (micro)))
 
-#endif
+#include <epiphany/ephy-adblock.h>
+#include <epiphany/ephy-adblock-manager.h>
+#include <epiphany/ephy-base-embed.h>
+#include <epiphany/ephy-bookmarks.h>
+#include <epiphany/ephy-bookmarks-type-builtins.h>
+#include <epiphany/ephy-command-manager.h>
+#include <epiphany/ephy-cookie-manager.h>
+#include <epiphany/ephy-dialog.h>
+#include <epiphany/ephy-embed-container.h>
+#include <epiphany/ephy-embed-event.h>
+#include <epiphany/ephy-embed-factory.h>
+#include <epiphany/ephy-embed.h>
+#include <epiphany/ephy-embed-persist.h>
+#include <epiphany/ephy-embed-prefs.h>
+#include <epiphany/ephy-embed-shell.h>
+#include <epiphany/ephy-embed-single.h>
+#include <epiphany/ephy-embed-type-builtins.h>
+#include <epiphany/ephy-embed-utils.h>
+#include <epiphany/ephy-extension.h>
+#include <epiphany/ephy-extensions-manager.h>
+#include <epiphany/ephy-history.h>
+#include <epiphany/ephy-history-item.h>
+#include <epiphany/ephy-lib-type-builtins.h>
+#include <epiphany/ephy-link.h>
+#include <epiphany/ephy-loader.h>
+#include <epiphany/ephy-node-db.h>
+#include <epiphany/ephy-node.h>
+#include <epiphany/ephy-notebook.h>
+#include <epiphany/ephy-password-manager.h>
+#include <epiphany/ephy-permission-manager.h>
+#include <epiphany/ephy-session.h>
+#include <epiphany/ephy-shell.h>
+#include <epiphany/ephy-state.h>
+#include <epiphany/ephy-statusbar.h>
+#include <epiphany/ephy-type-builtins.h>
+#include <epiphany/ephy-window.h>
+
+#undef __EPHY_EPIPHANY_H_INSIDE__
+
+#endif /* !__EPIPHANY_H__ */

Modified: trunk/src/epiphany.override
==============================================================================
--- trunk/src/epiphany.override	(original)
+++ trunk/src/epiphany.override	Fri Apr 11 21:05:25 2008
@@ -22,6 +22,7 @@
 headers
 #include <Python.h>               
 #define NO_IMPORT
+#include <config.h>
 #include <pygobject.h>
 #include <pygtk/pygtk.h>
 #include "ephy-bookmarks.h"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]