From bc3acca7eed4f90a33f43b624b4a49d09a75160e Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Sat, 12 Apr 2008 15:22:57 +0000
Subject: Add epiphany.h. Only allow including epiphany.h; all other headers
 are private

svn path=/trunk/; revision=8211
---
 embed/Makefile.am                   | 4 ++++
 embed/ephy-adblock-manager.h        | 4 ++++
 embed/ephy-adblock.h                | 4 ++++
 embed/ephy-base-embed.h             | 4 ++++
 embed/ephy-command-manager.h        | 4 ++++
 embed/ephy-cookie-manager.h         | 4 ++++
 embed/ephy-download.h               | 4 ++++
 embed/ephy-embed-container.h        | 4 ++++
 embed/ephy-embed-dialog.h           | 4 ++++
 embed/ephy-embed-event.h            | 4 ++++
 embed/ephy-embed-factory.h          | 4 ++++
 embed/ephy-embed-find.h             | 4 ++++
 embed/ephy-embed-persist.h          | 4 ++++
 embed/ephy-embed-prefs.h            | 4 ++++
 embed/ephy-embed-shell.h            | 4 ++++
 embed/ephy-embed-single.h           | 4 ++++
 embed/ephy-embed-utils.h            | 4 ++++
 embed/ephy-embed.h                  | 4 ++++
 embed/ephy-encodings.h              | 4 ++++
 embed/ephy-favicon-cache.h          | 4 ++++
 embed/ephy-history-item.h           | 4 ++++
 embed/ephy-history.h                | 4 ++++
 embed/ephy-password-manager.h       | 4 ++++
 embed/ephy-permission-manager.h     | 4 ++++
 embed/webkit/webkit-embed-persist.c | 2 ++
 embed/webkit/webkit-embed-prefs.c   | 2 ++
 26 files changed, 100 insertions(+)

(limited to 'embed')

diff --git a/embed/Makefile.am b/embed/Makefile.am
index b472219bf..1640334d8 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -107,6 +107,7 @@ ephy-embed-type-builtins.c: stamp-ephy-embed-type-builtins.c Makefile
 	@true
 stamp-ephy-embed-type-builtins.c: Makefile $(INST_H_FILES)
 	$(GLIB_MKENUMS) \
+		--fhead "#include <config.h>\n\n" \
 		--fhead "#include \"ephy-embed-type-builtins.h\"\n\n" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--fprod "\n#include \"@filename@\"" \
@@ -127,6 +128,9 @@ ephy-embed-type-builtins.h: stamp-ephy-embed-type-builtins.h Makefile
 	@true
 stamp-ephy-embed-type-builtins.h: Makefile $(INST_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_EMBED_TYPE_BUILTINS_H\n" \
 		--fhead "#define EPHY_EMBED_TYPE_BUILTINS_H 1\n\n" \
 		--fhead "#include <glib-object.h>\n\n" \
diff --git a/embed/ephy-adblock-manager.h b/embed/ephy-adblock-manager.h
index d6687fa2f..e13b51890 100644
--- a/embed/ephy-adblock-manager.h
+++ b/embed/ephy-adblock-manager.h
@@ -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_ADBLOCK_MANAGER_H
 #define EPHY_ADBLOCK_MANAGER_H
 
diff --git a/embed/ephy-adblock.h b/embed/ephy-adblock.h
index 4ecadd25e..4df48e605 100644
--- a/embed/ephy-adblock.h
+++ b/embed/ephy-adblock.h
@@ -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_ADBLOCK_H
 #define EPHY_ADBLOCK_H
 
diff --git a/embed/ephy-base-embed.h b/embed/ephy-base-embed.h
index 1f439afff..d2043a8b9 100644
--- a/embed/ephy-base-embed.h
+++ b/embed/ephy-base-embed.h
@@ -81,4 +81,8 @@ void  ephy_base_embed_set_visibility (EphyBaseEmbed *embed,
 
 G_END_DECLS
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #endif /* __EPHY_BASE_EMBED_H__ */
diff --git a/embed/ephy-command-manager.h b/embed/ephy-command-manager.h
index 0e34c9567..c2b55e138 100644
--- a/embed/ephy-command-manager.h
+++ b/embed/ephy-command-manager.h
@@ -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_COMMAND_MANAGER_H
 #define EPHY_COMMAND_MANAGER_H
 
diff --git a/embed/ephy-cookie-manager.h b/embed/ephy-cookie-manager.h
index bc8069ed3..58d8788bd 100644
--- a/embed/ephy-cookie-manager.h
+++ b/embed/ephy-cookie-manager.h
@@ -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_COOKIE_MANAGER_H
 #define EPHY_COOKIE_MANAGER_H
 
diff --git a/embed/ephy-download.h b/embed/ephy-download.h
index c89f2f9a3..53fec9dc6 100644
--- a/embed/ephy-download.h
+++ b/embed/ephy-download.h
@@ -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_DOWNLOAD_H
 #define EPHY_DOWNLOAD_H
 
diff --git a/embed/ephy-embed-container.h b/embed/ephy-embed-container.h
index 1cb5565b1..8a502fdd0 100644
--- a/embed/ephy-embed-container.h
+++ b/embed/ephy-embed-container.h
@@ -17,6 +17,10 @@
  *
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EMBED_CONTAINER_H
 #define EPHY_EMBED_CONTAINER_H
 
diff --git a/embed/ephy-embed-dialog.h b/embed/ephy-embed-dialog.h
index 292b82698..2efb2be15 100644
--- a/embed/ephy-embed-dialog.h
+++ b/embed/ephy-embed-dialog.h
@@ -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_EMBED_DIALOG_H
 #define EPHY_EMBED_DIALOG_H
 
diff --git a/embed/ephy-embed-event.h b/embed/ephy-embed-event.h
index f6e4bf177..c66dc5248 100644
--- a/embed/ephy-embed-event.h
+++ b/embed/ephy-embed-event.h
@@ -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_EMBED_EVENT_H
 #define EPHY_EMBED_EVENT_H
 
diff --git a/embed/ephy-embed-factory.h b/embed/ephy-embed-factory.h
index fe0ed8f86..02bbc28cc 100644
--- a/embed/ephy-embed-factory.h
+++ b/embed/ephy-embed-factory.h
@@ -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_EMBED_FACTORY_H
 #define EPHY_EMBED_FACTORY_H
 
diff --git a/embed/ephy-embed-find.h b/embed/ephy-embed-find.h
index 5d2536f96..7179e8abc 100644
--- a/embed/ephy-embed-find.h
+++ b/embed/ephy-embed-find.h
@@ -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_EMBED_FIND_H
 #define EPHY_EMBED_FIND_H
 
diff --git a/embed/ephy-embed-persist.h b/embed/ephy-embed-persist.h
index b078a236a..a5f7a82f3 100644
--- a/embed/ephy-embed-persist.h
+++ b/embed/ephy-embed-persist.h
@@ -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_EMBED_PERSIST_H
 #define EPHY_EMBED_PERSIST_H
 
diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h
index fce0ed04d..0222c96cb 100644
--- a/embed/ephy-embed-prefs.h
+++ b/embed/ephy-embed-prefs.h
@@ -39,4 +39,8 @@
 #define CONF_RENDERING_FONT_MIN_SIZE_OLD "/apps/epiphany/web/font_min_size"
 #define CONF_RENDERING_FONT_TYPE_OLD "/apps/epiphany/web/default_font_type"
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #define USER_STYLESHEET_FILENAME	"user-stylesheet.css"
diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h
index 163f4f267..116116e4c 100644
--- a/embed/ephy-embed-shell.h
+++ b/embed/ephy-embed-shell.h
@@ -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_EMBED_SHELL_H
 #define EPHY_EMBED_SHELL_H
 
diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h
index 8ce865737..fb97d1d2f 100644
--- a/embed/ephy-embed-single.h
+++ b/embed/ephy-embed-single.h
@@ -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_EMBED_SINGLE_H
 #define EPHY_EMBED_SINGLE_H
 
diff --git a/embed/ephy-embed-utils.h b/embed/ephy-embed-utils.h
index cb36073e6..7de058f53 100644
--- a/embed/ephy-embed-utils.h
+++ b/embed/ephy-embed-utils.h
@@ -22,6 +22,10 @@
  *  $Id: 
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EMBED_UTILS_H
 #define EPHY_EMBED_UTILS_H
 
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index ed3934c8f..55bf0821f 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -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_EMBED_H
 #define EPHY_EMBED_H
 
diff --git a/embed/ephy-encodings.h b/embed/ephy-encodings.h
index 435b48b21..feb553127 100644
--- a/embed/ephy-encodings.h
+++ b/embed/ephy-encodings.h
@@ -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_ENCODINGS_H
 #define EPHY_ENCODINGS_H
 
diff --git a/embed/ephy-favicon-cache.h b/embed/ephy-favicon-cache.h
index 9a6c0264f..d225e9b27 100644
--- a/embed/ephy-favicon-cache.h
+++ b/embed/ephy-favicon-cache.h
@@ -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_FAVICON_CACHE_H
 #define EPHY_FAVICON_CACHE_H
 
diff --git a/embed/ephy-history-item.h b/embed/ephy-history-item.h
index 7ec7871d5..ec53a4b99 100644
--- a/embed/ephy-history-item.h
+++ b/embed/ephy-history-item.h
@@ -50,4 +50,8 @@ char*       ephy_history_item_get_title (EphyHistoryItem *item);
 
 G_END_DECLS
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #endif /* __EPHY_HISTORY_ITEM_H__ */
diff --git a/embed/ephy-history.h b/embed/ephy-history.h
index feafefb7a..3bc7ad752 100644
--- a/embed/ephy-history.h
+++ b/embed/ephy-history.h
@@ -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_H
 #define EPHY_HISTORY_H
 
diff --git a/embed/ephy-password-manager.h b/embed/ephy-password-manager.h
index 499ccc9cf..90dd90508 100644
--- a/embed/ephy-password-manager.h
+++ b/embed/ephy-password-manager.h
@@ -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_PASSWORD_MANAGER_H
 #define EPHY_PASSWORD_MANAGER_H
 
diff --git a/embed/ephy-permission-manager.h b/embed/ephy-permission-manager.h
index 4457bcad5..884fbfcab 100644
--- a/embed/ephy-permission-manager.h
+++ b/embed/ephy-permission-manager.h
@@ -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_PERMISSION_MANAGER_H
 #define EPHY_PERMISSION_MANAGER_H
 
diff --git a/embed/webkit/webkit-embed-persist.c b/embed/webkit/webkit-embed-persist.c
index 24b467d42..3298293af 100644
--- a/embed/webkit/webkit-embed-persist.c
+++ b/embed/webkit/webkit-embed-persist.c
@@ -18,6 +18,8 @@
  *
  */
 
+#include <config.h>
+
 #include "webkit-embed-persist.h"
 
 static void     webkit_embed_persist_class_init (WebKitEmbedPersistClass *klass);
diff --git a/embed/webkit/webkit-embed-prefs.c b/embed/webkit/webkit-embed-prefs.c
index f9e2a7efd..978be49fb 100644
--- a/embed/webkit/webkit-embed-prefs.c
+++ b/embed/webkit/webkit-embed-prefs.c
@@ -17,6 +17,8 @@
  *
  */
 
+#include <config.h>
+
 #include <glib.h>
 #include <webkit/webkit.h>
 
-- 
cgit v1.2.3