diff options
84 files changed, 103 insertions, 443 deletions
diff --git a/configure.ac b/configure.ac index e140eebbd..e8889db8d 100644 --- a/configure.ac +++ b/configure.ac @@ -212,8 +212,6 @@ AC_DEFINE_UNQUOTED([LSB_DISTRIBUTOR],["$LSB_DISTRIBUTOR"],[Distributor name]) # Output files # ************ -AC_DEFINE([EPIPHANY_COMPILATION],[1],[Compiling epiphany]) - AC_CONFIG_FILES([ Makefile data/Makefile diff --git a/embed/Makefile.am b/embed/Makefile.am index 2f9bd4fb8..8969e1b59 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -7,26 +7,10 @@ AM_LDFLAGS = $(WARN_LDFLAGS) noinst_LTLIBRARIES = libephyembed.la -NOINST_H_FILES = \ - ephy-about-handler.h \ - ephy-downloads-manager.h \ - ephy-embed-private.h \ - ephy-encoding.h \ - ephy-encodings.h \ - ephy-file-monitor.h - -INST_H_FILES = \ +TYPES_H_FILES = \ ephy-download.h \ - ephy-embed.h \ - ephy-embed-container.h \ - ephy-embed-event.h \ - ephy-embed-prefs.h \ ephy-embed-shell.h \ - ephy-embed-utils.h \ - ephy-find-toolbar.h \ - ephy-web-view.h \ - ephy-web-extension-proxy.h - + ephy-web-view.h BUILT_SOURCES = \ ephy-embed-type-builtins.c \ @@ -34,22 +18,36 @@ BUILT_SOURCES = \ libephyembed_la_SOURCES = \ ephy-about-handler.c \ + ephy-about-handler.h \ ephy-downloads-manager.c \ + ephy-downloads-manager.h \ ephy-download.c \ + ephy-download.h \ ephy-embed.c \ + ephy-embed.h \ ephy-embed-container.c \ + ephy-embed-container.h \ ephy-embed-event.c \ + ephy-embed-event.h \ + ephy-embed-prefs.h \ + ephy-embed-private.h \ ephy-embed-shell.c \ + ephy-embed-shell.h \ ephy-embed-utils.c \ + ephy-embed-utils.h \ ephy-encoding.c \ + ephy-encoding.h \ ephy-encodings.c \ + ephy-encodings.h \ ephy-file-monitor.c \ + ephy-file-monitor.h \ ephy-find-toolbar.c \ + ephy-find-toolbar.h \ ephy-embed-prefs.c \ ephy-web-view.c \ + ephy-web-view.h \ ephy-web-extension-proxy.c \ - $(INST_H_FILES) \ - $(NOINST_H_FILES) + ephy-web-extension-proxy.h nodist_libephyembed_la_SOURCES = \ $(BUILT_SOURCES) @@ -80,7 +78,7 @@ stamp_files = \ ephy-embed-type-builtins.c: stamp-ephy-embed-type-builtins.c Makefile @true -stamp-ephy-embed-type-builtins.c: Makefile $(INST_H_FILES) +stamp-ephy-embed-type-builtins.c: Makefile $(TYPES_H_FILES) $(AM_V_GEN) $(GLIB_MKENUMS) \ --fhead "#include <config.h>\n\n" \ --fhead "#include \"ephy-embed-type-builtins.h\"\n\n" \ @@ -101,11 +99,8 @@ stamp-ephy-embed-type-builtins.c: Makefile $(INST_H_FILES) ephy-embed-type-builtins.h: stamp-ephy-embed-type-builtins.h Makefile @true -stamp-ephy-embed-type-builtins.h: Makefile $(INST_H_FILES) +stamp-ephy-embed-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_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-download.h b/embed/ephy-download.h index 546bd6337..8958d0761 100644 --- a/embed/ephy-download.h +++ b/embed/ephy-download.h @@ -20,10 +20,6 @@ * along with Epiphany. 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_DOWNLOAD_H #define _EPHY_DOWNLOAD_H diff --git a/embed/ephy-embed-container.h b/embed/ephy-embed-container.h index 1a5049691..596b7ae29 100644 --- a/embed/ephy-embed-container.h +++ b/embed/ephy-embed-container.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_EMBED_CONTAINER_H #define EPHY_EMBED_CONTAINER_H diff --git a/embed/ephy-embed-event.h b/embed/ephy-embed-event.h index 7226408fa..f20810232 100644 --- a/embed/ephy-embed-event.h +++ b/embed/ephy-embed-event.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_EMBED_EVENT_H #define EPHY_EMBED_EVENT_H diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h index 5c31f50cc..500c440d9 100644 --- a/embed/ephy-embed-prefs.h +++ b/embed/ephy-embed-prefs.h @@ -23,10 +23,6 @@ #include <webkit2/webkit2.h> -#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" #define FAVICON_SIZE 16 diff --git a/embed/ephy-embed-private.h b/embed/ephy-embed-private.h index aefd91088..a591125f1 100644 --- a/embed/ephy-embed-private.h +++ b/embed/ephy-embed-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 - #include "ephy-embed-shell.h" #include "ephy-history-types.h" #include "ephy-web-view.h" diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h index f49a1eabf..1617d4533 100644 --- a/embed/ephy-embed-shell.h +++ b/embed/ephy-embed-shell.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_EMBED_SHELL_H #define EPHY_EMBED_SHELL_H diff --git a/embed/ephy-embed-utils.h b/embed/ephy-embed-utils.h index 425121272..64841c386 100644 --- a/embed/ephy-embed-utils.h +++ b/embed/ephy-embed-utils.h @@ -19,10 +19,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_EMBED_UTILS_H #define EPHY_EMBED_UTILS_H diff --git a/embed/ephy-encoding.h b/embed/ephy-encoding.h index 2b0c41fee..728a1e4ca 100644 --- a/embed/ephy-encoding.h +++ b/embed/ephy-encoding.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_H #define EPHY_ENCODING_H diff --git a/embed/ephy-encodings.h b/embed/ephy-encodings.h index b72904a79..980fc09ca 100644 --- a/embed/ephy-encodings.h +++ b/embed/ephy-encodings.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_ENCODINGS_H #define EPHY_ENCODINGS_H diff --git a/embed/ephy-file-monitor.h b/embed/ephy-file-monitor.h index 75d77f739..b2321757c 100644 --- a/embed/ephy-file-monitor.h +++ b/embed/ephy-file-monitor.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_FILE_MONITOR_H #define EPHY_FILE_MONITOR_H diff --git a/embed/ephy-find-toolbar.h b/embed/ephy-find-toolbar.h index 07e06bce2..3a1985e88 100644 --- a/embed/ephy-find-toolbar.h +++ b/embed/ephy-find-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_FIND_TOOLBAR_H #define EPHY_FIND_TOOLBAR_H diff --git a/embed/ephy-web-extension-proxy.h b/embed/ephy-web-extension-proxy.h index 1dac674c3..a80e8bff8 100644 --- a/embed/ephy-web-extension-proxy.h +++ b/embed/ephy-web-extension-proxy.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_WEB_EXTENSION_PROXY_H #define EPHY_WEB_EXTENSION_PROXY_H diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h index 26c4e04db..91480d4ca 100644 --- a/embed/ephy-web-view.h +++ b/embed/ephy-web-view.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_WEB_VIEW_H #define EPHY_WEB_VIEW_H diff --git a/embed/web-extension/ephy-web-dom-utils.h b/embed/web-extension/ephy-web-dom-utils.h index 9339c83d2..3d05af15c 100644 --- a/embed/web-extension/ephy-web-dom-utils.h +++ b/embed/web-extension/ephy-web-dom-utils.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_WEB_DOM_UTILS_H #define EPHY_WEB_DOM_UTILS_H @@ -50,6 +46,7 @@ void ephy_web_dom_utils_get_absolute_position_for_element(WebKitDOMElement *elem double *y); char *ephy_web_dom_utils_get_selection_as_string (WebKitDOMDOMSelection *selection); + G_END_DECLS #endif diff --git a/lib/Makefile.am b/lib/Makefile.am index f0dcfc5f2..e8e96b5ce 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,73 +5,63 @@ AM_LDFLAGS = $(WARN_LDFLAGS) noinst_LTLIBRARIES = libephymisc.la -NOINST_H_FILES = \ - ephy-debug.h \ - ephy-dnd.h \ - ephy-favicon-helpers.h \ - ephy-file-helpers.h \ - ephy-form-auth-data.h \ - ephy-gui.h \ - ephy-langs.h \ - ephy-node-filter.h \ - ephy-node-common.h \ - ephy-prefs.h \ - ephy-profile-utils.h \ - ephy-security-levels.h \ - ephy-signal-accumulator.h \ - ephy-smaps.h \ - ephy-sqlite.h \ - ephy-sqlite-connection.h \ - ephy-sqlite-statement.h \ - ephy-string.h \ - ephy-snapshot-service.h \ - ephy-time-helpers.h \ - ephy-uri-helpers.h \ - ephy-web-app-utils.h \ - ephy-zoom.h - TYPES_H_FILES = \ ephy-initial-state.h \ ephy-node.h \ ephy-security-levels.h -INST_H_FILES = \ - ephy-initial-state.h \ - ephy-node.h \ - ephy-node-db.h \ - ephy-settings.h - libephymisc_la_SOURCES = \ ephy-debug.c \ + ephy-debug.h \ ephy-dnd.c \ + ephy-dnd.h \ ephy-favicon-helpers.c \ + ephy-favicon-helpers.h \ ephy-file-helpers.c \ + ephy-file-helpers.h \ ephy-form-auth-data.c \ + ephy-form-auth-data.h \ ephy-gui.c \ + ephy-gui.h \ ephy-initial-state.c \ + ephy-initial-state.h \ ephy-langs.c \ + ephy-langs.h \ ephy-node.c \ ephy-node.h \ - ephy-node-filter.c \ ephy-node-common.h \ + ephy-node-filter.c \ + ephy-node-filter.h \ ephy-node-db.c \ + ephy-node-db.h \ ephy-prefs.h \ ephy-profile-utils.c \ ephy-profile-utils.h \ ephy-security-levels.c \ + ephy-security-levels.h \ ephy-settings.c \ + ephy-settings.h \ ephy-signal-accumulator.c \ + ephy-signal-accumulator.h \ ephy-smaps.c \ + ephy-smaps.h \ ephy-snapshot-service.c \ + ephy-snapshot-service.h \ + ephy-sqlite.h \ ephy-sqlite-connection.c \ + ephy-sqlite-connection.h \ ephy-sqlite-statement.c \ + ephy-sqlite-statement.h \ ephy-string.c \ + ephy-string.h \ ephy-time-helpers.c \ + ephy-time-helpers.h \ ephy-uri-helpers.c \ + ephy-uri-helpers.h \ ephy-web-app-utils.c \ + ephy-web-app-utils.h \ ephy-zoom.c \ - $(INST_H_FILES) \ - $(NOINST_H_FILES) + ephy-zoom.h nodist_libephymisc_la_SOURCES = \ $(BUILT_SOURCES) @@ -79,7 +69,7 @@ nodist_libephymisc_la_SOURCES = \ libephymisc_la_CPPFLAGS = \ -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/egg \ - -DDATADIR="\"$(datadir)\"" \ + -DDATADIR=\"$(datadir)\" \ -DSHARE_DIR=\"$(pkgdatadir)\" \ -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \ -DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \ @@ -161,9 +151,6 @@ ephy-lib-type-builtins.h: stamp-ephy-lib-type-builtins.h Makefile @true stamp-ephy-lib-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_LIB_TYPE_BUILTINS_H\n" \ --fhead "#define EPHY_LIB_TYPE_BUILTINS_H 1\n\n" \ --fhead "#include <glib-object.h>\n\n" \ diff --git a/lib/ephy-debug.h b/lib/ephy-debug.h index c7d96e788..4225642bb 100644 --- a/lib/ephy-debug.h +++ b/lib/ephy-debug.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_DEBUG_H #define EPHY_DEBUG_H diff --git a/lib/ephy-dnd.h b/lib/ephy-dnd.h index b2462e718..275740a5a 100644 --- a/lib/ephy-dnd.h +++ b/lib/ephy-dnd.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_DND_H #define EPHY_DND_H diff --git a/lib/ephy-favicon-helpers.h b/lib/ephy-favicon-helpers.h index 3fcee37fa..8ae228f40 100644 --- a/lib/ephy-favicon-helpers.h +++ b/lib/ephy-favicon-helpers.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_FAVICON_HELPERS_H #define EPHY_FAVICON_HELPERS_H diff --git a/lib/ephy-file-helpers.h b/lib/ephy-file-helpers.h index f10fd3cd7..650ff0f57 100644 --- a/lib/ephy-file-helpers.h +++ b/lib/ephy-file-helpers.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_FILE_HELPERS_H #define EPHY_FILE_HELPERS_H diff --git a/lib/ephy-gui.h b/lib/ephy-gui.h index fc3466ac8..f10a79477 100644 --- a/lib/ephy-gui.h +++ b/lib/ephy-gui.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_GUI_H #define EPHY_GUI_H diff --git a/lib/ephy-initial-state.h b/lib/ephy-initial-state.h index 9ffa0af45..74d7a8a80 100644 --- a/lib/ephy-initial-state.h +++ b/lib/ephy-initial-state.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_STATE_H #define EPHY_STATE_H diff --git a/lib/ephy-langs.h b/lib/ephy-langs.h index 56964d92d..bfe82d1dd 100644 --- a/lib/ephy-langs.h +++ b/lib/ephy-langs.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_LANGS_H #define EPHY_LANGS_H diff --git a/lib/ephy-node-common.h b/lib/ephy-node-common.h index 9f92d798e..7c5b37216 100644 --- a/lib/ephy-node-common.h +++ b/lib/ephy-node-common.h @@ -46,8 +46,4 @@ typedef enum EPHY_NODE_NORMAL_PRIORITY } EphyNodePriority; -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only <epiphany/epiphany.h> can be included directly." -#endif - #endif /* EPHY_NODE_COMMON_H */ diff --git a/lib/ephy-node-db.h b/lib/ephy-node-db.h index c0c0821e1..88ff698be 100644 --- a/lib/ephy-node-db.h +++ b/lib/ephy-node-db.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_NODE_DB_H #define EPHY_NODE_DB_H diff --git a/lib/ephy-node-filter.h b/lib/ephy-node-filter.h index c9703eac1..67f21de9b 100644 --- a/lib/ephy-node-filter.h +++ b/lib/ephy-node-filter.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_NODE_FILTER_H #define EPHY_NODE_FILTER_H diff --git a/lib/ephy-node.h b/lib/ephy-node.h index 254ca75f3..14b43ced7 100644 --- a/lib/ephy-node.h +++ b/lib/ephy-node.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_NODE_H #define EPHY_NODE_H diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h index 58cc5fafc..5f01c9dab 100644 --- a/lib/ephy-prefs.h +++ b/lib/ephy-prefs.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_PREFS_H #define EPHY_PREFS_H diff --git a/lib/ephy-security-levels.h b/lib/ephy-security-levels.h index f2774f276..033f3302f 100644 --- a/lib/ephy-security-levels.h +++ b/lib/ephy-security-levels.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_SECURITY_LEVELS_H #define EPHY_SECURITY_LEVELS_H diff --git a/lib/ephy-settings.h b/lib/ephy-settings.h index 8ecb36ac9..e05821e0e 100644 --- a/lib/ephy-settings.h +++ b/lib/ephy-settings.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_SETTINGS_H #define EPHY_SETTINGS_H diff --git a/lib/ephy-signal-accumulator.h b/lib/ephy-signal-accumulator.h index 4a01a56cb..68a0f5004 100644 --- a/lib/ephy-signal-accumulator.h +++ b/lib/ephy-signal-accumulator.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_SIGNAL_ACCUMULATORS_H #define EPHY_SIGNAL_ACCUMULATORS_H diff --git a/lib/ephy-string.h b/lib/ephy-string.h index 59630bce8..04a5be055 100644 --- a/lib/ephy-string.h +++ b/lib/ephy-string.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_STRING_H #define EPHY_STRING_H diff --git a/lib/ephy-time-helpers.h b/lib/ephy-time-helpers.h index ff00c1eec..19a6cac81 100644 --- a/lib/ephy-time-helpers.h +++ b/lib/ephy-time-helpers.h @@ -19,15 +19,11 @@ /* Following code is copied from Rhythmbox rb-cut-and-paste-code.h */ -#include <time.h> - -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only <epiphany/epiphany.h> can be included directly." -#endif - #ifndef EPHY_TIME_HELPERS_H #define EPHY_TIME_HELPERS_H +#include <time.h> + G_BEGIN_DECLS char *eel_strdup_strftime (const char *format, diff --git a/lib/ephy-uri-helpers.h b/lib/ephy-uri-helpers.h index 6e1467847..31f2aa418 100644 --- a/lib/ephy-uri-helpers.h +++ b/lib/ephy-uri-helpers.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_URI_HELPERS_H #define EPHY_URI_HELPERS_H diff --git a/lib/ephy-web-app-utils.h b/lib/ephy-web-app-utils.h index 4b1299aaf..8b92a24cb 100644 --- a/lib/ephy-web-app-utils.h +++ b/lib/ephy-web-app-utils.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_WEB_APP_UTILS_H #define EPHY_WEB_APP_UTILS_H diff --git a/lib/ephy-zoom.h b/lib/ephy-zoom.h index acfc3be99..1e0afc8aa 100644 --- a/lib/ephy-zoom.h +++ b/lib/ephy-zoom.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_ZOOM_H #define EPHY_ZOOM_H diff --git a/lib/history/Makefile.am b/lib/history/Makefile.am index cccfd2795..ab4f3afbf 100644 --- a/lib/history/Makefile.am +++ b/lib/history/Makefile.am @@ -67,9 +67,6 @@ ephy-history-type-builtins.h: stamp-ephy-history-type-builtins.h Makefile stamp-ephy-history-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_HISTORY_TYPE_BUILTINS_H\n" \ --fhead "#define EPHY_HISTORY_TYPE_BUILTINS_H 1\n\n" \ --fhead "#include <glib-object.h>\n\n" \ diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am index 9d501ebf1..0d78f8c40 100644 --- a/lib/widgets/Makefile.am +++ b/lib/widgets/Makefile.am @@ -43,9 +43,6 @@ ephy-widgets-type-builtins.h: stamp-ephy-widgets-type-builtins.h Makefile stamp-ephy-widgets-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_WIDGETS_TYPE_BUILTINS_H\n" \ --fhead "#define EPHY_WIDGETS_TYPE_BUILTINS_H 1\n\n" \ --fhead "#include <glib-object.h>\n\n" \ diff --git a/lib/widgets/ephy-certificate-dialog.h b/lib/widgets/ephy-certificate-dialog.h index af55ba3ef..f0a31dcd0 100644 --- a/lib/widgets/ephy-certificate-dialog.h +++ b/lib/widgets/ephy-certificate-dialog.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_CERTIFICATE_DIALOG_H #define EPHY_CERTIFICATE_DIALOG_H diff --git a/lib/widgets/ephy-download-widget.h b/lib/widgets/ephy-download-widget.h index 372d314ab..bf1335b08 100644 --- a/lib/widgets/ephy-download-widget.h +++ b/lib/widgets/ephy-download-widget.h @@ -20,10 +20,6 @@ * along with Epiphany. 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_DOWNLOAD_WIDGET_H #define _EPHY_DOWNLOAD_WIDGET_H diff --git a/lib/widgets/ephy-file-chooser.h b/lib/widgets/ephy-file-chooser.h index 84f4ad49d..e97fe3da9 100644 --- a/lib/widgets/ephy-file-chooser.h +++ b/lib/widgets/ephy-file-chooser.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_FILE_CHOOSER_H #define EPHY_FILE_CHOOSER_H diff --git a/lib/widgets/ephy-location-entry.h b/lib/widgets/ephy-location-entry.h index 22e761154..170f86e66 100644 --- a/lib/widgets/ephy-location-entry.h +++ b/lib/widgets/ephy-location-entry.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_LOCATION_ENTRY_H #define EPHY_LOCATION_ENTRY_H diff --git a/lib/widgets/ephy-middle-clickable-button.h b/lib/widgets/ephy-middle-clickable-button.h index e1bd5a873..88cd7367c 100644 --- a/lib/widgets/ephy-middle-clickable-button.h +++ b/lib/widgets/ephy-middle-clickable-button.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_MIDDLE_CLICKABLE_BUTTON_H__ #define __EPHY_MIDDLE_CLICKABLE_BUTTON_H__ diff --git a/lib/widgets/ephy-node-view.h b/lib/widgets/ephy-node-view.h index 52aa13691..2a0a9faa5 100644 --- a/lib/widgets/ephy-node-view.h +++ b/lib/widgets/ephy-node-view.h @@ -143,8 +143,4 @@ gboolean ephy_node_view_get_iter_for_node (EphyNodeView *view, G_END_DECLS -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only <epiphany/epiphany.h> can be included directly." -#endif - #endif /* EPHY_NODE_VIEW_H */ diff --git a/lib/widgets/ephy-security-popover.h b/lib/widgets/ephy-security-popover.h index 06e48c991..252f191bf 100644 --- a/lib/widgets/ephy-security-popover.h +++ b/lib/widgets/ephy-security-popover.h @@ -17,10 +17,6 @@ * */ -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only <epiphany/epiphany.h> can be included directly." -#endif - #ifndef EPHY_SECURITY_POPOVER_H #define EPHY_SECURITY_POPOVER_H diff --git a/lib/widgets/ephy-tree-model-node.h b/lib/widgets/ephy-tree-model-node.h index 4e6d4dc09..ef36d6698 100644 --- a/lib/widgets/ephy-tree-model-node.h +++ b/lib/widgets/ephy-tree-model-node.h @@ -78,8 +78,4 @@ void ephy_tree_model_node_iter_from_node (EphyTreeModelNode *mod G_END_DECLS -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only <epiphany/epiphany.h> can be included directly." -#endif - #endif /* EPHY_TREE_MODEL_NODE_H */ diff --git a/lib/widgets/ephy-tree-model-sort.h b/lib/widgets/ephy-tree-model-sort.h index 2c9671fd3..72a1681ea 100644 --- a/lib/widgets/ephy-tree-model-sort.h +++ b/lib/widgets/ephy-tree-model-sort.h @@ -14,10 +14,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_TREE_MODEL_SORT_H #define EPHY_TREE_MODEL_SORT_H diff --git a/lib/widgets/ephy-zoom-action.h b/lib/widgets/ephy-zoom-action.h index 957ef5a68..ccfdc8835 100644 --- a/lib/widgets/ephy-zoom-action.h +++ b/lib/widgets/ephy-zoom-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_ZOOM_ACTION_H #define EPHY_ZOOM_ACTION_H 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 |