diff options
54 files changed, 281 insertions, 36 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 161e91dfb..baa982e5d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,7 +52,7 @@ INST_H_FILES = \ ephy-shell.h \ ephy-statusbar.h \ ephy-window.h \ - ephy-version.h \ + epiphany.h \ $(NULL) libephymain_la_SOURCES = \ @@ -259,6 +259,7 @@ ephy-type-builtins.c: stamp-ephy-type-builtins.c Makefile @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 @@ ephy-type-builtins.h: stamp-ephy-type-builtins.h Makefile @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" \ diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am index aceaeef13..bf87823dd 100644 --- a/src/bookmarks/Makefile.am +++ b/src/bookmarks/Makefile.am @@ -66,6 +66,7 @@ ephy-bookmarks-type-builtins.c: stamp-ephy-bookmarks-type-builtins.c Makefile @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 @@ ephy-bookmarks-type-builtins.h: stamp-ephy-bookmarks-type-builtins.h Makefile @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" \ diff --git a/src/bookmarks/ephy-bookmark-action-group.h b/src/bookmarks/ephy-bookmark-action-group.h index 5096884b8..f62cb65a1 100644 --- a/src/bookmarks/ephy-bookmark-action-group.h +++ b/src/bookmarks/ephy-bookmark-action-group.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_BOOKMARK_ACTION_GROUP_H #define EPHY_BOOKMARK_ACTION_GROUP_H diff --git a/src/bookmarks/ephy-bookmark-action.h b/src/bookmarks/ephy-bookmark-action.h index 32b65f63e..1e46832ed 100644 --- a/src/bookmarks/ephy-bookmark-action.h +++ b/src/bookmarks/ephy-bookmark-action.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_BOOKMARK_ACTION_H #define EPHY_BOOKMARK_ACTION_H diff --git a/src/bookmarks/ephy-bookmark-factory-action.h b/src/bookmarks/ephy-bookmark-factory-action.h index d7960a07d..106231798 100644 --- a/src/bookmarks/ephy-bookmark-factory-action.h +++ b/src/bookmarks/ephy-bookmark-factory-action.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_BOOKMARK_FACTORY_ACTION_H #define EPHY_BOOKMARK_FACTORY_ACTION_H diff --git a/src/bookmarks/ephy-bookmark-properties.h b/src/bookmarks/ephy-bookmark-properties.h index f43e51327..62d54a0c7 100644 --- a/src/bookmarks/ephy-bookmark-properties.h +++ b/src/bookmarks/ephy-bookmark-properties.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_BOOKMARK_PROPERTIES_H #define EPHY_BOOKMARK_PROPERTIES_H diff --git a/src/bookmarks/ephy-bookmarks-editor.h b/src/bookmarks/ephy-bookmarks-editor.h index 089e3bb89..00dd7eeed 100644 --- a/src/bookmarks/ephy-bookmarks-editor.h +++ b/src/bookmarks/ephy-bookmarks-editor.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_BOOKMARKS_EDITOR_H #define EPHY_BOOKMARKS_EDITOR_H diff --git a/src/bookmarks/ephy-bookmarks-export.h b/src/bookmarks/ephy-bookmarks-export.h index 445b424e1..b0d13a0fe 100644 --- a/src/bookmarks/ephy-bookmarks-export.h +++ b/src/bookmarks/ephy-bookmarks-export.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_BOOKMARKS_EXPORT_H #define EPHY_BOOKMARKS_EXPORT_H diff --git a/src/bookmarks/ephy-bookmarks-import.h b/src/bookmarks/ephy-bookmarks-import.h index 990cdce7d..12a197b5f 100644 --- a/src/bookmarks/ephy-bookmarks-import.h +++ b/src/bookmarks/ephy-bookmarks-import.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_BOOKMARKS_IMPORT_H #define EPHY_BOOKMARKS_IMPORT_H diff --git a/src/bookmarks/ephy-bookmarks-menu.h b/src/bookmarks/ephy-bookmarks-menu.h index 204ec019a..e94251f1d 100644 --- a/src/bookmarks/ephy-bookmarks-menu.h +++ b/src/bookmarks/ephy-bookmarks-menu.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_BOOKMARKS_MENU_H #define EPHY_BOOKMARKS_MENU_H diff --git a/src/bookmarks/ephy-bookmarks-ui.h b/src/bookmarks/ephy-bookmarks-ui.h index 4da51bdca..83ca1b1be 100644 --- a/src/bookmarks/ephy-bookmarks-ui.h +++ b/src/bookmarks/ephy-bookmarks-ui.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_BOOKMARKS_UI_H #define EPHY_BOOKMARKS_UI_H diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h index ac149235b..ee3bff26c 100644 --- a/src/bookmarks/ephy-bookmarks.h +++ b/src/bookmarks/ephy-bookmarks.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_BOOKMARKS_H #define EPHY_BOOKMARKS_H diff --git a/src/bookmarks/ephy-nodes-cover.h b/src/bookmarks/ephy-nodes-cover.h index 3199280ad..f3418a635 100644 --- a/src/bookmarks/ephy-nodes-cover.h +++ b/src/bookmarks/ephy-nodes-cover.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_NODES_COVER_H #define EPHY_NODES_COVER_H diff --git a/src/bookmarks/ephy-open-tabs-action.h b/src/bookmarks/ephy-open-tabs-action.h index 394cf68a3..d7d63efc9 100644 --- a/src/bookmarks/ephy-open-tabs-action.h +++ b/src/bookmarks/ephy-open-tabs-action.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_OPEN_TABS_ACTION_H #define EPHY_OPEN_TABS_ACTION_H diff --git a/src/bookmarks/ephy-related-action.h b/src/bookmarks/ephy-related-action.h index 0dea6840f..724f25c64 100644 --- a/src/bookmarks/ephy-related-action.h +++ b/src/bookmarks/ephy-related-action.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_RELATED_ACTION_H #define EPHY_RELATED_ACTION_H diff --git a/src/bookmarks/ephy-topic-action-group.h b/src/bookmarks/ephy-topic-action-group.h index 1713e7749..34e370068 100644 --- a/src/bookmarks/ephy-topic-action-group.h +++ b/src/bookmarks/ephy-topic-action-group.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_TOPIC_ACTION_GROUP_H #define EPHY_TOPIC_ACTION_GROUP_H diff --git a/src/bookmarks/ephy-topic-action.h b/src/bookmarks/ephy-topic-action.h index 92b0874c4..01c1f311f 100644 --- a/src/bookmarks/ephy-topic-action.h +++ b/src/bookmarks/ephy-topic-action.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_TOPIC_ACTION_H #define EPHY_TOPIC_ACTION_H diff --git a/src/bookmarks/ephy-topic-factory-action.h b/src/bookmarks/ephy-topic-factory-action.h index 1c1ceaeb7..213bd906d 100644 --- a/src/bookmarks/ephy-topic-factory-action.h +++ b/src/bookmarks/ephy-topic-factory-action.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_TOPIC_FACTORY_ACTION_H #define EPHY_TOPIC_FACTORY_ACTION_H diff --git a/src/bookmarks/ephy-topics-entry.h b/src/bookmarks/ephy-topics-entry.h index f00f7b6db..bf98577ee 100644 --- a/src/bookmarks/ephy-topics-entry.h +++ b/src/bookmarks/ephy-topics-entry.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_TOPICS_ENTRY_H #define EPHY_TOPICS_ENTRY_H diff --git a/src/bookmarks/ephy-topics-palette.h b/src/bookmarks/ephy-topics-palette.h index 114a4290a..11f57f617 100644 --- a/src/bookmarks/ephy-topics-palette.h +++ b/src/bookmarks/ephy-topics-palette.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_TOPICS_PALETTE_H #define EPHY_TOPICS_PALETTE_H diff --git a/src/ephy-action-helper.h b/src/ephy-action-helper.h index fc5e31cd0..04c671f51 100644 --- a/src/ephy-action-helper.h +++ b/src/ephy-action-helper.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_ACTION_HELPER_H #define EPHY_ACTION_HELPER_H diff --git a/src/ephy-activation.h b/src/ephy-activation.h index 6605f92aa..45159e7c1 100644 --- a/src/ephy-activation.h +++ b/src/ephy-activation.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_ACTIVATION_H #define EPHY_ACTIVATION_H diff --git a/src/ephy-completion-model.h b/src/ephy-completion-model.h index 6df64d288..4e70ccef8 100644 --- a/src/ephy-completion-model.h +++ b/src/ephy-completion-model.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_COMPLETION_MODEL_H #define EPHY_COMPLETION_MODEL_H diff --git a/src/ephy-dbus.h b/src/ephy-dbus.h index 61d4eceb3..80719df5a 100644 --- a/src/ephy-dbus.h +++ b/src/ephy-dbus.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_DBUS_H #define EPHY_DBUS_H diff --git a/src/ephy-encoding-dialog.h b/src/ephy-encoding-dialog.h index 184d8b525..94434c2f7 100644 --- a/src/ephy-encoding-dialog.h +++ b/src/ephy-encoding-dialog.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_ENCODING_DIALOG_H #define EPHY_ENCODING_DIALOG_H diff --git a/src/ephy-encoding-menu.h b/src/ephy-encoding-menu.h index a0726d888..0b11e4cde 100644 --- a/src/ephy-encoding-menu.h +++ b/src/ephy-encoding-menu.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_ENCODING_MENU_H #define EPHY_ENCODING_MENU_H diff --git a/src/ephy-extension.h b/src/ephy-extension.h index 8a8b49677..7b9a9bd50 100644 --- a/src/ephy-extension.h +++ b/src/ephy-extension.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_EXTENSION_H #define EPHY_EXTENSION_H diff --git a/src/ephy-extensions-manager.h b/src/ephy-extensions-manager.h index 20475bdd5..2b30352be 100644 --- a/src/ephy-extensions-manager.h +++ b/src/ephy-extensions-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_EXTENSIONS_MANAGER_H #define EPHY_EXTENSIONS_MANAGER_H diff --git a/src/ephy-find-toolbar.h b/src/ephy-find-toolbar.h index c94e877f9..cad71a9f4 100644 --- a/src/ephy-find-toolbar.h +++ b/src/ephy-find-toolbar.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_FIND_TOOLBAR_H #define EPHY_FIND_TOOLBAR_H diff --git a/src/ephy-fullscreen-popup.h b/src/ephy-fullscreen-popup.h index 3ee1279b7..e7f6929f4 100644 --- a/src/ephy-fullscreen-popup.h +++ b/src/ephy-fullscreen-popup.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_FULLSCREEN_POPUP_H #define EPHY_FULLSCREEN_POPUP_H diff --git a/src/ephy-go-action.h b/src/ephy-go-action.h index e50848e33..109a7763d 100644 --- a/src/ephy-go-action.h +++ b/src/ephy-go-action.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_GO_ACTION_H #define EPHY_GO_ACTION_H diff --git a/src/ephy-history-window.h b/src/ephy-history-window.h index 65d8133a3..e72ab0649 100644 --- a/src/ephy-history-window.h +++ b/src/ephy-history-window.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_WINDOW_H #define EPHY_HISTORY_WINDOW_H diff --git a/src/ephy-home-action.h b/src/ephy-home-action.h index 6116d87fe..014090206 100644 --- a/src/ephy-home-action.h +++ b/src/ephy-home-action.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_HOME_ACTION_H #define EPHY_HOME_ACTION_H diff --git a/src/ephy-link-action.h b/src/ephy-link-action.h index 1aa6d2224..9e55fc0fb 100644 --- a/src/ephy-link-action.h +++ b/src/ephy-link-action.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_LINK_ACTION_H #define EPHY_LINK_ACTION_H diff --git a/src/ephy-link.h b/src/ephy-link.h index 20e72fc9f..5e937c1d0 100644 --- a/src/ephy-link.h +++ b/src/ephy-link.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_LINK_H #define EPHY_LINK_H diff --git a/src/ephy-location-action.h b/src/ephy-location-action.h index ca7da42b9..ac56a3d3b 100644 --- a/src/ephy-location-action.h +++ b/src/ephy-location-action.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_LOCATION_ACTION_H #define EPHY_LOCATION_ACTION_H diff --git a/src/ephy-lockdown.h b/src/ephy-lockdown.h index 70d480c2e..89622b893 100644 --- a/src/ephy-lockdown.h +++ b/src/ephy-lockdown.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_LOCKDOWN_H #define EPHY_LOCKDOWN_H diff --git a/src/ephy-navigation-action.h b/src/ephy-navigation-action.h index 67596548d..afd5515e2 100644 --- a/src/ephy-navigation-action.h +++ b/src/ephy-navigation-action.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_NAVIGATION_ACTION_H #define EPHY_NAVIGATION_ACTION_H diff --git a/src/ephy-net-monitor.h b/src/ephy-net-monitor.h index 6a97094ff..3028e3629 100644 --- a/src/ephy-net-monitor.h +++ b/src/ephy-net-monitor.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_NET_MONITOR_H #define EPHY_NET_MONITOR_H diff --git a/src/ephy-notebook.h b/src/ephy-notebook.h index e0663103c..ad41966fe 100644 --- a/src/ephy-notebook.h +++ b/src/ephy-notebook.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_NOTEBOOK_H #define EPHY_NOTEBOOK_H diff --git a/src/ephy-python-extension.h b/src/ephy-python-extension.h index 00450f3f7..50862b791 100644 --- a/src/ephy-python-extension.h +++ b/src/ephy-python-extension.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_PYTHON_EXTENSION_H #define EPHY_PYTHON_EXTENSION_H diff --git a/src/ephy-python-loader.h b/src/ephy-python-loader.h index 291fd7a15..b55cabf08 100644 --- a/src/ephy-python-loader.h +++ b/src/ephy-python-loader.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_PYTHON_LOADER_H #define EPHY_PYTHON_LOADER_H diff --git a/src/ephy-python.h b/src/ephy-python.h index 250f3d12e..35a5f6bda 100644 --- a/src/ephy-python.h +++ b/src/ephy-python.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_PYTHON_H #define EPHY_PYTHON_H diff --git a/src/ephy-session.h b/src/ephy-session.h index e2b01b0da..c3b325a17 100644 --- a/src/ephy-session.h +++ b/src/ephy-session.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_SESSION_H #define EPHY_SESSION_H diff --git a/src/ephy-shell.h b/src/ephy-shell.h index f0ee6f060..a306751ae 100644 --- a/src/ephy-shell.h +++ b/src/ephy-shell.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_SHELL_H #define EPHY_SHELL_H diff --git a/src/ephy-statusbar.h b/src/ephy-statusbar.h index 16d88377e..928c619e5 100644 --- a/src/ephy-statusbar.h +++ b/src/ephy-statusbar.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_STATUSBAR_H #define EPHY_STATUSBAR_H diff --git a/src/ephy-tabs-menu.h b/src/ephy-tabs-menu.h index 9e45f6d50..fc96717a2 100644 --- a/src/ephy-tabs-menu.h +++ b/src/ephy-tabs-menu.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_TABS_MENU_H #define EPHY_TABS_MENU_H diff --git a/src/ephy-toolbar-editor.h b/src/ephy-toolbar-editor.h index 2b9de0621..0c9cebc6d 100644 --- a/src/ephy-toolbar-editor.h +++ b/src/ephy-toolbar-editor.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_TOOLBAR_EDITOR_H #define EPHY_TOOLBAR_EDITOR_H diff --git a/src/ephy-toolbar.h b/src/ephy-toolbar.h index 89f45066d..ae728c092 100644 --- a/src/ephy-toolbar.h +++ b/src/ephy-toolbar.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_TOOLBAR_H #define EPHY_TOOLBAR_H diff --git a/src/ephy-toolbars-model.h b/src/ephy-toolbars-model.h index 7384016e1..a3dd0d0c6 100644 --- a/src/ephy-toolbars-model.h +++ b/src/ephy-toolbars-model.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_TOOLBARS_MODEL_H #define EPHY_TOOLBARS_MODEL_H diff --git a/src/ephy-version.h.in b/src/ephy-version.h.in deleted file mode 100644 index efc0e5aec..000000000 --- a/src/ephy-version.h.in +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */ -/* Copyright © 2008 Xan Lopez <xan@gnome.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef __EPHY_VERSION_H__ -#define __EPHY_VERSION_H__ - -/* 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@) - -#define EPHY_CHECK_VERSION(major, minor, micro)\ - (EPHY_MAJOR_VERSION > (major) || \ - (EPHY_MAJOR_VERSION == (major) && EPHY_MINOR_VERSION > (minor)) || \ - (EPHY_MAJOR_VERSION == (major) && EPHY_MINOR_VERSION == (minor) && \ - EPHY_MICRO_VERSION >= (micro))) - -#endif diff --git a/src/ephy-window.h b/src/ephy-window.h index f55f4c99d..99653913d 100644 --- a/src/ephy-window.h +++ b/src/ephy-window.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_WINDOW_H #define EPHY_WINDOW_H diff --git a/src/epiphany.h.in b/src/epiphany.h.in new file mode 100644 index 000000000..aa4a6781c --- /dev/null +++ b/src/epiphany.h.in @@ -0,0 +1,75 @@ +/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */ +/* Copyright © 2008 Xan Lopez <xan@gnome.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef __EPIPHANY_H__ +#define __EPIPHANY_H__ + +#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@) + +#define EPHY_CHECK_VERSION(major, minor, micro)\ + (EPHY_MAJOR_VERSION > (major) || \ + (EPHY_MAJOR_VERSION == (major) && EPHY_MINOR_VERSION > (minor)) || \ + (EPHY_MAJOR_VERSION == (major) && EPHY_MINOR_VERSION == (minor) && \ + EPHY_MICRO_VERSION >= (micro))) + +#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__ */ diff --git a/src/epiphany.override b/src/epiphany.override index 5dd0c26e1..28622fd6c 100644 --- a/src/epiphany.override +++ b/src/epiphany.override @@ -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" |