diff options
Diffstat (limited to 'src')
35 files changed, 55 insertions, 194 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 05f0f4926..21f6749fa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,67 +15,69 @@ EXTRA_DIST = \ $(RESOURCE_FILES) \ $(NULL) -NOINST_H_FILES = \ - ephy-action-helper.h \ - ephy-combined-stop-reload-action.h \ - ephy-encoding-dialog.h \ - ephy-encoding-row.h \ - ephy-history-window.h \ - ephy-home-action.h \ - ephy-link-action.h \ - ephy-lockdown.h \ - ephy-location-controller.h \ +TYPES_H_FILES = \ + ephy-link.h \ + ephy-session.h \ + ephy-shell.h \ + ephy-window.h \ ephy-navigation-history-action.h \ - ephy-private.h \ - ephy-search-provider.h \ ephy-title-box.h \ - ephy-toolbar.h \ - ephy-window-action.h \ - languages.h \ - clear-data-dialog.h \ - cookies-dialog.h \ - passwords-dialog.h \ - popup-commands.h \ - prefs-dialog.h \ - window-commands.h - -INST_H_FILES = \ - ephy-link.h \ - ephy-notebook.h \ - ephy-session.h \ - ephy-shell.h \ - ephy-window.h \ $(NULL) libephymain_la_SOURCES = \ + clear-data-dialog.c \ + clear-data-dialog.h \ + cookies-dialog.c \ + cookies-dialog.h \ ephy-action-helper.c \ + ephy-action-helper.h \ ephy-completion-model.c \ ephy-completion-model.h \ ephy-combined-stop-reload-action.c \ + ephy-combined-stop-reload-action.h \ ephy-encoding-dialog.c \ + ephy-encoding-dialog.h \ ephy-encoding-row.c \ + ephy-encoding-row.h \ ephy-home-action.c \ + ephy-home-action.h \ ephy-history-window.c \ + ephy-history-window.h \ ephy-link.c \ + ephy-link.h \ ephy-link-action.c \ + ephy-link-action.h \ ephy-location-controller.c \ + ephy-location-controller.h \ ephy-lockdown.c \ + ephy-lockdown.h \ ephy-navigation-history-action.c \ + ephy-navigation-history-action.h \ ephy-notebook.c \ + ephy-notebook.h \ + ephy-private.h \ + ephy-search-provider.h \ ephy-session.c \ + ephy-session.h \ ephy-shell.c \ + ephy-shell.h \ ephy-title-box.c \ + ephy-title-box.h \ ephy-toolbar.c \ + ephy-toolbar.h \ ephy-window.c \ + ephy-window.h \ ephy-window-action.c \ - clear-data-dialog.c \ - cookies-dialog.c \ + ephy-window-action.h \ + languages.h \ passwords-dialog.c \ + passwords-dialog.h \ popup-commands.c \ + popup-commands.h \ prefs-dialog.c \ + prefs-dialog.h \ window-commands.c \ - $(INST_H_FILES) \ - $(NOINST_H_FILES) \ + window-commands.h \ $(NULL) nodist_libephymain_la_SOURCES = \ @@ -217,7 +219,7 @@ stamp_files = \ ephy-type-builtins.c: stamp-ephy-type-builtins.c Makefile @true -stamp-ephy-type-builtins.c: Makefile $(INST_H_FILES) $(NOINST_H_FILES) +stamp-ephy-type-builtins.c: Makefile $(TYPES_H_FILES) $(AM_V_GEN) $(GLIB_MKENUMS) \ --fhead "#include <config.h>\n\n" \ --fhead "#include \"ephy-type-builtins.h\"\n\n" \ @@ -238,11 +240,8 @@ stamp-ephy-type-builtins.c: Makefile $(INST_H_FILES) $(NOINST_H_FILES) ephy-type-builtins.h: stamp-ephy-type-builtins.h Makefile @true -stamp-ephy-type-builtins.h: Makefile $(INST_H_FILES) $(NOINST_H_FILES) +stamp-ephy-type-builtins.h: Makefile $(TYPES_H_FILES) $(AM_V_GEN) $(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 46e3da899..f0f41ba57 100644 --- a/src/bookmarks/Makefile.am +++ b/src/bookmarks/Makefile.am @@ -3,43 +3,40 @@ noinst_LTLIBRARIES = libephybookmarks.la AM_CFLAGS = $(WARN_CFLAGS) AM_LDFLAGS = $(WARN_LDFLAGS) -INST_H_FILES = \ +TYPES_H_FILES = \ ephy-bookmarks.h -NOINST_H_FILES = \ - ephy-bookmark-action.h \ - ephy-bookmarks-editor.h \ - ephy-bookmarks-export.h \ - ephy-bookmarks-import.h \ - ephy-bookmarks-ui.h \ - ephy-bookmarks-menu.h \ - ephy-bookmark-properties.h \ - ephy-topic-action.h \ - ephy-open-tabs-action.h \ - ephy-topic-action-group.h \ - ephy-bookmark-action-group.h \ - ephy-topics-entry.h \ - ephy-topics-palette.h \ - ephy-nodes-cover.h - libephybookmarks_la_SOURCES = \ ephy-bookmarks.c \ + ephy-bookmarks.h \ ephy-bookmark-action.c \ + ephy-bookmark-action.h \ ephy-bookmarks-editor.c \ + ephy-bookmarks-editor.h \ ephy-bookmarks-export.c \ + ephy-bookmarks-export.h \ ephy-bookmarks-import.c \ + ephy-bookmarks-import.h \ ephy-bookmarks-ui.c \ + ephy-bookmarks-ui.h \ ephy-bookmarks-menu.c \ + ephy-bookmarks-menu.h \ ephy-bookmark-properties.c \ + ephy-bookmark-properties.h \ ephy-topic-action.c \ + ephy-topic-action.h \ ephy-open-tabs-action.c \ + ephy-open-tabs-action.h \ ephy-topic-action-group.c \ + ephy-topic-action-group.h \ ephy-bookmark-action-group.c \ + ephy-bookmark-action-group.h \ ephy-topics-entry.c \ + ephy-topics-entry.h \ ephy-topics-palette.c \ - ephy-nodes-cover.c \ - $(NOINST_H_FILES) \ - $(INST_H_FILES) + ephy-topics-palette.h \ + ephy-nodes-cover.c \ + ephy-nodes-cover.h nodist_libephybookmarks_la_SOURCES = \ $(BUILT_SOURCES) @@ -56,7 +53,7 @@ stamp_files = \ 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) +stamp-ephy-bookmarks-type-builtins.c: Makefile $(TYPES_H_FILES) $(AM_V_GEN) $(GLIB_MKENUMS) \ --fhead "#include <config.h>\n\n" \ --fhead "#include \"ephy-bookmarks-type-builtins.h\"\n\n" \ @@ -77,11 +74,8 @@ stamp-ephy-bookmarks-type-builtins.c: Makefile $(INST_H_FILES) $(NOINST_H_FILES) 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) +stamp-ephy-bookmarks-type-builtins.h: Makefile $(TYPES_H_FILES) $(AM_V_GEN) $(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 2d7444fb4..6ec3f1ec5 100644 --- a/src/bookmarks/ephy-bookmark-action-group.h +++ b/src/bookmarks/ephy-bookmark-action-group.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 db89ee20b..5c780e678 100644 --- a/src/bookmarks/ephy-bookmark-action.h +++ b/src/bookmarks/ephy-bookmark-action.h @@ -16,10 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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-properties.h b/src/bookmarks/ephy-bookmark-properties.h index 851ec7c5e..68c55d0b8 100644 --- a/src/bookmarks/ephy-bookmark-properties.h +++ b/src/bookmarks/ephy-bookmark-properties.h @@ -17,10 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 a86dac3be..4504d88aa 100644 --- a/src/bookmarks/ephy-bookmarks-editor.h +++ b/src/bookmarks/ephy-bookmarks-editor.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 fe3a3dad4..469ffbd71 100644 --- a/src/bookmarks/ephy-bookmarks-export.h +++ b/src/bookmarks/ephy-bookmarks-export.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 14160797e..a5221af8b 100644 --- a/src/bookmarks/ephy-bookmarks-import.h +++ b/src/bookmarks/ephy-bookmarks-import.h @@ -16,10 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 c322dc2c9..9bf6fd21f 100644 --- a/src/bookmarks/ephy-bookmarks-menu.h +++ b/src/bookmarks/ephy-bookmarks-menu.h @@ -17,10 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 691c89067..df9f1e7be 100644 --- a/src/bookmarks/ephy-bookmarks-ui.h +++ b/src/bookmarks/ephy-bookmarks-ui.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 709bce2c4..396b5672f 100644 --- a/src/bookmarks/ephy-bookmarks.h +++ b/src/bookmarks/ephy-bookmarks.h @@ -16,10 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 28f5e2113..4acbffbd2 100644 --- a/src/bookmarks/ephy-nodes-cover.h +++ b/src/bookmarks/ephy-nodes-cover.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 9039b36f3..a0b42bee9 100644 --- a/src/bookmarks/ephy-open-tabs-action.h +++ b/src/bookmarks/ephy-open-tabs-action.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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-topic-action-group.h b/src/bookmarks/ephy-topic-action-group.h index feac94005..c652b40b0 100644 --- a/src/bookmarks/ephy-topic-action-group.h +++ b/src/bookmarks/ephy-topic-action-group.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 8dbac7ad3..5dc661551 100644 --- a/src/bookmarks/ephy-topic-action.h +++ b/src/bookmarks/ephy-topic-action.h @@ -16,10 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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-topics-entry.h b/src/bookmarks/ephy-topics-entry.h index aca5a3808..185cfe33b 100644 --- a/src/bookmarks/ephy-topics-entry.h +++ b/src/bookmarks/ephy-topics-entry.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 6046bcf8c..3880ed1c5 100644 --- a/src/bookmarks/ephy-topics-palette.h +++ b/src/bookmarks/ephy-topics-palette.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 607ce1859..82faa560f 100644 --- a/src/ephy-action-helper.h +++ b/src/ephy-action-helper.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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-completion-model.h b/src/ephy-completion-model.h index e0340d8b5..9fcbc3045 100644 --- a/src/ephy-completion-model.h +++ b/src/ephy-completion-model.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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-encoding-dialog.h b/src/ephy-encoding-dialog.h index 6cd445a0f..b5d9e8546 100644 --- a/src/ephy-encoding-dialog.h +++ b/src/ephy-encoding-dialog.h @@ -16,10 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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-history-window.h b/src/ephy-history-window.h index 610b93999..8a4b2ee5b 100644 --- a/src/ephy-history-window.h +++ b/src/ephy-history-window.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 f0361ff46..867fcaf5a 100644 --- a/src/ephy-home-action.h +++ b/src/ephy-home-action.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 4e7e06768..c75f5a3da 100644 --- a/src/ephy-link-action.h +++ b/src/ephy-link-action.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 927873f6e..d09a3ccda 100644 --- a/src/ephy-link.h +++ b/src/ephy-link.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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-controller.h b/src/ephy-location-controller.h index 041bd8ca2..25ff30b76 100644 --- a/src/ephy-location-controller.h +++ b/src/ephy-location-controller.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only <epiphany/epiphany.h> can be included directly." -#endif - #ifndef EPHY_LOCATION_CONTROLLER_H #define EPHY_LOCATION_CONTROLLER_H diff --git a/src/ephy-lockdown.h b/src/ephy-lockdown.h index 74e00cd69..4a3e925e3 100644 --- a/src/ephy-lockdown.h +++ b/src/ephy-lockdown.h @@ -17,10 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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-history-action.h b/src/ephy-navigation-history-action.h index 4c34b6429..fa2d5885a 100644 --- a/src/ephy-navigation-history-action.h +++ b/src/ephy-navigation-history-action.h @@ -17,10 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only <epiphany/epiphany.h> can be included directly." -#endif - #ifndef EPHY_NAVIGATION_HISTORY_ACTION_H #define EPHY_NAVIGATION_HISTORY_ACTION_H diff --git a/src/ephy-notebook.h b/src/ephy-notebook.h index 278320a06..af8ca4d87 100644 --- a/src/ephy-notebook.h +++ b/src/ephy-notebook.h @@ -17,10 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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-private.h b/src/ephy-private.h index b71bc289a..66a48a3df 100644 --- a/src/ephy-private.h +++ b/src/ephy-private.h @@ -16,10 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only <epiphany/epiphany.h> can be included directly." -#endif - #ifndef EPHY_PRIVATE_H #define EPHY_PRIVATE_H diff --git a/src/ephy-session.h b/src/ephy-session.h index 8f90d6cd5..051ae3a18 100644 --- a/src/ephy-session.h +++ b/src/ephy-session.h @@ -17,10 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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 28abd1cdc..2db9b2e6f 100644 --- a/src/ephy-shell.h +++ b/src/ephy-shell.h @@ -18,10 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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-toolbar.h b/src/ephy-toolbar.h index 233530d57..eaca83fca 100644 --- a/src/ephy-toolbar.h +++ b/src/ephy-toolbar.h @@ -16,10 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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-window-action.h b/src/ephy-window-action.h index e9613a029..c0009504b 100644 --- a/src/ephy-window-action.h +++ b/src/ephy-window-action.h @@ -16,10 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only <epiphany/epiphany.h> can be included directly." -#endif - #ifndef EPHY_WINDOW_ACTION_H #define EPHY_WINDOW_ACTION_H diff --git a/src/ephy-window.h b/src/ephy-window.h index dda5d692a..464d62fc2 100644 --- a/src/ephy-window.h +++ b/src/ephy-window.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#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/window-commands.h b/src/window-commands.h index 9a63be5d7..29b602532 100644 --- a/src/window-commands.h +++ b/src/window-commands.h @@ -15,10 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only <epiphany/epiphany.h> can be included directly." -#endif - #ifndef WINDOW_COMMANDS_H #define WINDOW_COMMANDS_H |