epiphany-extensions r1718 - in trunk/extensions: actions adblock auto-reload auto-scroller certificates error-viewer error-viewer/mozilla extensions-manager-ui gestures greasemonkey greasemonkey/mozilla java-console livehttpheaders page-info page-info/mozilla permissions push-scroller rss sample sample-mozilla select-stylesheet select-stylesheet/mozilla sidebar smart-bookmarks smart-bookmarks/mozilla tab-groups tab-states

[chpe svn gnome org]

Author: chpe
Date: Fri Apr 11 21:05:41 2008
New Revision: 1718
URL: http://svn.gnome.org/viewvc/epiphany-extensions?rev=1718&view=rev

Log:
Adapt to new epiphany/epiphany.h header inclusion policy.


Modified:
   trunk/extensions/actions/ephy-actions-extension-editor-dialog.h
   trunk/extensions/actions/ephy-actions-extension-properties-dialog.h
   trunk/extensions/actions/ephy-actions-extension.c
   trunk/extensions/actions/ephy-actions-extension.h
   trunk/extensions/adblock/ad-blocker.h
   trunk/extensions/adblock/ad-uri-tester.h
   trunk/extensions/adblock/adblock-ui.c
   trunk/extensions/adblock/adblock-ui.h
   trunk/extensions/adblock/ephy-adblock-extension.c
   trunk/extensions/adblock/ephy-adblock-extension.h
   trunk/extensions/auto-reload/ephy-auto-reload-extension.c
   trunk/extensions/auto-scroller/ephy-auto-scroller-extension.c
   trunk/extensions/auto-scroller/ephy-auto-scroller.h
   trunk/extensions/certificates/ephy-certificates-extension.c
   trunk/extensions/error-viewer/ephy-error-viewer-extension.c
   trunk/extensions/error-viewer/error-viewer.h
   trunk/extensions/error-viewer/link-checker.h
   trunk/extensions/error-viewer/mozilla/mozilla-helpers.h
   trunk/extensions/error-viewer/mozilla/mozilla-link-checker.h
   trunk/extensions/error-viewer/sgml-validator.c
   trunk/extensions/error-viewer/sgml-validator.h
   trunk/extensions/extensions-manager-ui/ephy-extensions-manager-ui-extension.c
   trunk/extensions/extensions-manager-ui/extensions-manager-ui.c
   trunk/extensions/extensions-manager-ui/extensions-manager-ui.h
   trunk/extensions/gestures/ephy-gesture.c
   trunk/extensions/gestures/ephy-gesture.h
   trunk/extensions/gestures/ephy-gestures-extension.c
   trunk/extensions/greasemonkey/ephy-greasemonkey-extension.c
   trunk/extensions/greasemonkey/mozilla/mozilla-helpers.h
   trunk/extensions/java-console/ephy-java-console-extension.c
   trunk/extensions/livehttpheaders/ephy-livehttpheaders-extension.c
   trunk/extensions/livehttpheaders/livehttpheaders-ui.c
   trunk/extensions/livehttpheaders/livehttpheaders-ui.h
   trunk/extensions/page-info/ephy-page-info-extension.c
   trunk/extensions/page-info/mozilla/mozilla-helpers.h
   trunk/extensions/page-info/page-info-dialog.c
   trunk/extensions/page-info/page-info-dialog.h
   trunk/extensions/permissions/ephy-permissions-dialog.c
   trunk/extensions/permissions/ephy-permissions-extension.c
   trunk/extensions/push-scroller/ephy-push-scroller-extension.c
   trunk/extensions/push-scroller/ephy-push-scroller.h
   trunk/extensions/rss/ephy-rss-extension.c
   trunk/extensions/rss/rss-ui.h
   trunk/extensions/sample-mozilla/ephy-sample2-extension.c
   trunk/extensions/sample/ephy-sample-extension.c
   trunk/extensions/select-stylesheet/ephy-css-menu.c
   trunk/extensions/select-stylesheet/ephy-css-menu.h
   trunk/extensions/select-stylesheet/ephy-select-stylesheet-extension.c
   trunk/extensions/select-stylesheet/mozilla/mozilla-helpers.h
   trunk/extensions/sidebar/ephy-sidebar-embed.c
   trunk/extensions/sidebar/ephy-sidebar-embed.h
   trunk/extensions/sidebar/ephy-sidebar-extension.c
   trunk/extensions/sidebar/sidebar-commands.c
   trunk/extensions/smart-bookmarks/mozilla/mozilla-selection.h
   trunk/extensions/smart-bookmarks/smart-bookmarks-extension.c
   trunk/extensions/tab-groups/ephy-tab-grouper.c
   trunk/extensions/tab-groups/ephy-tab-groups-extension.c
   trunk/extensions/tab-states/ephy-tab-states-extension.c

Modified: trunk/extensions/actions/ephy-actions-extension-editor-dialog.h
==============================================================================
--- trunk/extensions/actions/ephy-actions-extension-editor-dialog.h	(original)
+++ trunk/extensions/actions/ephy-actions-extension-editor-dialog.h	Fri Apr 11 21:05:41 2008
@@ -19,8 +19,7 @@
 #ifndef _EPHY_ACTIONS_EXTENSION_EDITOR_DIALOG_H
 #define _EPHY_ACTIONS_EXTENSION_EDITOR_DIALOG_H
 
-#include <epiphany/ephy-dialog.h>
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/actions/ephy-actions-extension-properties-dialog.h
==============================================================================
--- trunk/extensions/actions/ephy-actions-extension-properties-dialog.h	(original)
+++ trunk/extensions/actions/ephy-actions-extension-properties-dialog.h	Fri Apr 11 21:05:41 2008
@@ -19,9 +19,7 @@
 #ifndef _EPHY_ACTIONS_EXTENSION_PROPERTIES_DIALOG_H
 #define _EPHY_ACTIONS_EXTENSION_PROPERTIES_DIALOG_H
 
-#include <epiphany/ephy-dialog.h>
-#include <epiphany/ephy-extension.h>
-#include <epiphany/ephy-node.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/actions/ephy-actions-extension.c
==============================================================================
--- trunk/extensions/actions/ephy-actions-extension.c	(original)
+++ trunk/extensions/actions/ephy-actions-extension.c	Fri Apr 11 21:05:41 2008
@@ -21,8 +21,7 @@
 #include <stdarg.h>
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-#include <epiphany/ephy-embed-container.h>
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
 #include "ephy-file-helpers.h"
 #include "ephy-actions-extension.h"
 #include "ephy-actions-extension-editor-dialog.h"

Modified: trunk/extensions/actions/ephy-actions-extension.h
==============================================================================
--- trunk/extensions/actions/ephy-actions-extension.h	(original)
+++ trunk/extensions/actions/ephy-actions-extension.h	Fri Apr 11 21:05:41 2008
@@ -20,8 +20,7 @@
 #define _EPHY_ACTIONS_EXTENSION_H
 
 #include <glib-object.h>
-#include <epiphany/ephy-node-db.h>
-#include <epiphany/ephy-node.h>
+#include <epiphany/epiphany.h>
 #include "ephy-actions-extension-properties-dialog.h"
 
 G_BEGIN_DECLS

Modified: trunk/extensions/adblock/ad-blocker.h
==============================================================================
--- trunk/extensions/adblock/ad-blocker.h	(original)
+++ trunk/extensions/adblock/ad-blocker.h	Fri Apr 11 21:05:41 2008
@@ -23,7 +23,7 @@
 #include <glib-object.h>
 #include <gmodule.h>
 
-#include <epiphany/ephy-embed.h>
+#include <epiphany/epiphany.h>
 
 #include "ad-uri-tester.h"
 

Modified: trunk/extensions/adblock/ad-uri-tester.h
==============================================================================
--- trunk/extensions/adblock/ad-uri-tester.h	(original)
+++ trunk/extensions/adblock/ad-uri-tester.h	Fri Apr 11 21:05:41 2008
@@ -22,7 +22,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <gmodule.h>
-#include <epiphany/ephy-adblock.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/adblock/adblock-ui.c
==============================================================================
--- trunk/extensions/adblock/adblock-ui.c	(original)
+++ trunk/extensions/adblock/adblock-ui.c	Fri Apr 11 21:05:41 2008
@@ -26,8 +26,7 @@
 #include "adblock-pattern.h"
 #include "ephy-file-helpers.h"
 
-#include <epiphany/ephy-adblock-manager.h>
-#include <epiphany/ephy-embed-shell.h>
+#include <epiphany/epiphany.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtklabel.h>

Modified: trunk/extensions/adblock/adblock-ui.h
==============================================================================
--- trunk/extensions/adblock/adblock-ui.h	(original)
+++ trunk/extensions/adblock/adblock-ui.h	Fri Apr 11 21:05:41 2008
@@ -24,7 +24,7 @@
 
 #include "ad-uri-tester.h"
 
-#include <epiphany/ephy-dialog.h>
+#include <epiphany/epiphany.h>
 
 #include <glib.h>
 #include <glib-object.h>

Modified: trunk/extensions/adblock/ephy-adblock-extension.c
==============================================================================
--- trunk/extensions/adblock/ephy-adblock-extension.c	(original)
+++ trunk/extensions/adblock/ephy-adblock-extension.c	Fri Apr 11 21:05:41 2008
@@ -21,13 +21,7 @@
 
 #include "config.h"
 
-#include <epiphany/ephy-statusbar.h>
-#include <epiphany/ephy-window.h>
-#include <epiphany/ephy-adblock.h>
-#include <epiphany/ephy-adblock-manager.h>
-#include <epiphany/ephy-embed-container.h>
-#include <epiphany/ephy-embed-shell.h>
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
 
 #include "ephy-adblock-extension.h"
 #include "ephy-debug.h"

Modified: trunk/extensions/adblock/ephy-adblock-extension.h
==============================================================================
--- trunk/extensions/adblock/ephy-adblock-extension.h	(original)
+++ trunk/extensions/adblock/ephy-adblock-extension.h	Fri Apr 11 21:05:41 2008
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <epiphany/ephy-embed.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/auto-reload/ephy-auto-reload-extension.c
==============================================================================
--- trunk/extensions/auto-reload/ephy-auto-reload-extension.c	(original)
+++ trunk/extensions/auto-reload/ephy-auto-reload-extension.c	Fri Apr 11 21:05:41 2008
@@ -23,8 +23,7 @@
 #include "ephy-auto-reload-extension.h"
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-embed-container.h>
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
 
 #include <gtk/gtktoggleaction.h>
 #include <gtk/gtkuimanager.h>

Modified: trunk/extensions/auto-scroller/ephy-auto-scroller-extension.c
==============================================================================
--- trunk/extensions/auto-scroller/ephy-auto-scroller-extension.c	(original)
+++ trunk/extensions/auto-scroller/ephy-auto-scroller-extension.c	Fri Apr 11 21:05:41 2008
@@ -26,7 +26,7 @@
 #include "ephy-auto-scroller.h"
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
 
 #include <gmodule.h>
 

Modified: trunk/extensions/auto-scroller/ephy-auto-scroller.h
==============================================================================
--- trunk/extensions/auto-scroller/ephy-auto-scroller.h	(original)
+++ trunk/extensions/auto-scroller/ephy-auto-scroller.h	Fri Apr 11 21:05:41 2008
@@ -25,8 +25,8 @@
 
 #include <glib-object.h>
 #include <gtk/gtkwidget.h>
-#include <epiphany/ephy-embed.h>
-#include <epiphany/ephy-window.h>
+
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/certificates/ephy-certificates-extension.c
==============================================================================
--- trunk/extensions/certificates/ephy-certificates-extension.c	(original)
+++ trunk/extensions/certificates/ephy-certificates-extension.c	Fri Apr 11 21:05:41 2008
@@ -25,12 +25,7 @@
 
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-window.h>
-#include <epiphany/ephy-extension.h>
-#include <epiphany/ephy-embed.h>
-#include <epiphany/ephy-embed-single.h>
-#include <epiphany/ephy-embed-shell.h>
-#include <epiphany/ephy-statusbar.h>
+#include <epiphany/epiphany.h>
 
 #include <gtk/gtkaction.h>
 #include <gtk/gtkactiongroup.h>

Modified: trunk/extensions/error-viewer/ephy-error-viewer-extension.c
==============================================================================
--- trunk/extensions/error-viewer/ephy-error-viewer-extension.c	(original)
+++ trunk/extensions/error-viewer/ephy-error-viewer-extension.c	Fri Apr 11 21:05:41 2008
@@ -29,11 +29,7 @@
 
 #include "mozilla/mozilla-helpers.h"
 
-#include <epiphany/ephy-extension.h>
-#include <epiphany/ephy-window.h>
-#include <epiphany/ephy-embed.h>
-#include <epiphany/ephy-embed-container.h>
-#include <epiphany/ephy-embed-shell.h>
+#include <epiphany/epiphany.h>
 
 #include <gtk/gtkaction.h>
 #include <gtk/gtkactiongroup.h>

Modified: trunk/extensions/error-viewer/error-viewer.h
==============================================================================
--- trunk/extensions/error-viewer/error-viewer.h	(original)
+++ trunk/extensions/error-viewer/error-viewer.h	Fri Apr 11 21:05:41 2008
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 #include <gmodule.h>
 
-#include <epiphany/ephy-dialog.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/error-viewer/link-checker.h
==============================================================================
--- trunk/extensions/error-viewer/link-checker.h	(original)
+++ trunk/extensions/error-viewer/link-checker.h	Fri Apr 11 21:05:41 2008
@@ -26,7 +26,7 @@
 #include <gmodule.h>
 
 #include "error-viewer.h"
-#include <epiphany/ephy-embed.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/error-viewer/mozilla/mozilla-helpers.h
==============================================================================
--- trunk/extensions/error-viewer/mozilla/mozilla-helpers.h	(original)
+++ trunk/extensions/error-viewer/mozilla/mozilla-helpers.h	Fri Apr 11 21:05:41 2008
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include <epiphany/ephy-embed.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/error-viewer/mozilla/mozilla-link-checker.h
==============================================================================
--- trunk/extensions/error-viewer/mozilla/mozilla-link-checker.h	(original)
+++ trunk/extensions/error-viewer/mozilla/mozilla-link-checker.h	Fri Apr 11 21:05:41 2008
@@ -19,7 +19,7 @@
 #ifndef ERROR_VIEWER_MOZILLA_LINK_CHECKER_H
 #define ERROR_VIEWER_MOZILLA_LINK_CHECKER_H
 
-#include <epiphany/ephy-embed.h>
+#include <epiphany/epiphany.h>
 
 #include "link-checker.h"
 

Modified: trunk/extensions/error-viewer/sgml-validator.c
==============================================================================
--- trunk/extensions/error-viewer/sgml-validator.c	(original)
+++ trunk/extensions/error-viewer/sgml-validator.c	Fri Apr 11 21:05:41 2008
@@ -24,8 +24,7 @@
 
 #include "opensp/validate.h"
 
-#include <epiphany/ephy-embed-persist.h>
-#include <epiphany/ephy-embed-factory.h>
+#include <epiphany/epiphany.h>
 
 #include "ephy-file-helpers.h"
 #include "ephy-debug.h"

Modified: trunk/extensions/error-viewer/sgml-validator.h
==============================================================================
--- trunk/extensions/error-viewer/sgml-validator.h	(original)
+++ trunk/extensions/error-viewer/sgml-validator.h	Fri Apr 11 21:05:41 2008
@@ -26,7 +26,7 @@
 #include <gmodule.h>
 
 #include "error-viewer.h"
-#include <epiphany/ephy-embed.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/extensions-manager-ui/ephy-extensions-manager-ui-extension.c
==============================================================================
--- trunk/extensions/extensions-manager-ui/ephy-extensions-manager-ui-extension.c	(original)
+++ trunk/extensions/extensions-manager-ui/ephy-extensions-manager-ui-extension.c	Fri Apr 11 21:05:41 2008
@@ -24,7 +24,7 @@
 #include "ephy-extensions-manager-ui-extension.h"
 #include "extensions-manager-ui.h"
 
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
 
 #include "ephy-gui.h"
 #include "ephy-debug.h"

Modified: trunk/extensions/extensions-manager-ui/extensions-manager-ui.c
==============================================================================
--- trunk/extensions/extensions-manager-ui/extensions-manager-ui.c	(original)
+++ trunk/extensions/extensions-manager-ui/extensions-manager-ui.c	Fri Apr 11 21:05:41 2008
@@ -22,8 +22,7 @@
 
 #include "extensions-manager-ui.h"
 
-#include <epiphany/ephy-extensions-manager.h>
-#include <epiphany/ephy-shell.h>
+#include <epiphany/epiphany.h>
 
 #include "ephy-gui.h"
 #include "ephy-debug.h"

Modified: trunk/extensions/extensions-manager-ui/extensions-manager-ui.h
==============================================================================
--- trunk/extensions/extensions-manager-ui/extensions-manager-ui.h	(original)
+++ trunk/extensions/extensions-manager-ui/extensions-manager-ui.h	Fri Apr 11 21:05:41 2008
@@ -23,7 +23,7 @@
 #include <glib-object.h>
 #include <gmodule.h>
 
-#include <epiphany/ephy-dialog.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/gestures/ephy-gesture.c
==============================================================================
--- trunk/extensions/gestures/ephy-gesture.c	(original)
+++ trunk/extensions/gestures/ephy-gesture.c	Fri Apr 11 21:05:41 2008
@@ -37,8 +37,7 @@
 #include <gtk/gtkactiongroup.h>
 #include <gtk/gtkuimanager.h>
 
-#include <epiphany/ephy-embed-container.h>
-#include <epiphany/ephy-window.h>
+#include <epiphany/epiphany.h>
 
 #include <string.h>
 

Modified: trunk/extensions/gestures/ephy-gesture.h
==============================================================================
--- trunk/extensions/gestures/ephy-gesture.h	(original)
+++ trunk/extensions/gestures/ephy-gesture.h	Fri Apr 11 21:05:41 2008
@@ -26,7 +26,7 @@
 #include <gtk/gtkwidget.h>
 #include <gmodule.h>
 
-#include <epiphany/ephy-embed-event.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/gestures/ephy-gestures-extension.c
==============================================================================
--- trunk/extensions/gestures/ephy-gestures-extension.c	(original)
+++ trunk/extensions/gestures/ephy-gestures-extension.c	Fri Apr 11 21:05:41 2008
@@ -27,8 +27,7 @@
 #include "ephy-file-helpers.h"
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-embed.h>
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
 
 #include <gmodule.h>
 #include <libxml/tree.h>

Modified: trunk/extensions/greasemonkey/ephy-greasemonkey-extension.c
==============================================================================
--- trunk/extensions/greasemonkey/ephy-greasemonkey-extension.c	(original)
+++ trunk/extensions/greasemonkey/ephy-greasemonkey-extension.c	Fri Apr 11 21:05:41 2008
@@ -26,14 +26,7 @@
 #include "ephy-debug.h"
 #include "ephy-file-helpers.h"
 
-#include <epiphany/ephy-extension.h>
-#include <epiphany/ephy-embed.h>
-#include <epiphany/ephy-embed-container.h>
-#include <epiphany/ephy-embed-event.h>
-#include <epiphany/ephy-embed-factory.h>
-#include <epiphany/ephy-embed-persist.h>
-#include <epiphany/ephy-shell.h>
-#include <epiphany/ephy-window.h>
+#include <epiphany/epiphany.h>
 
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkuimanager.h>

Modified: trunk/extensions/greasemonkey/mozilla/mozilla-helpers.h
==============================================================================
--- trunk/extensions/greasemonkey/mozilla/mozilla-helpers.h	(original)
+++ trunk/extensions/greasemonkey/mozilla/mozilla-helpers.h	Fri Apr 11 21:05:41 2008
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 
-#include <epiphany/ephy-embed.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/java-console/ephy-java-console-extension.c
==============================================================================
--- trunk/extensions/java-console/ephy-java-console-extension.c	(original)
+++ trunk/extensions/java-console/ephy-java-console-extension.c	Fri Apr 11 21:05:41 2008
@@ -24,7 +24,7 @@
 #include "java-console.h"
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
 
 #include <glib/gi18n-lib.h>
 #include <gmodule.h>

Modified: trunk/extensions/livehttpheaders/ephy-livehttpheaders-extension.c
==============================================================================
--- trunk/extensions/livehttpheaders/ephy-livehttpheaders-extension.c	(original)
+++ trunk/extensions/livehttpheaders/ephy-livehttpheaders-extension.c	Fri Apr 11 21:05:41 2008
@@ -26,9 +26,7 @@
 #include "mozilla-helper.h"
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-extension.h>
-#include <epiphany/ephy-embed-single.h>
-#include <epiphany/ephy-shell.h>
+#include <epiphany/epiphany.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtkaction.h>

Modified: trunk/extensions/livehttpheaders/livehttpheaders-ui.c
==============================================================================
--- trunk/extensions/livehttpheaders/livehttpheaders-ui.c	(original)
+++ trunk/extensions/livehttpheaders/livehttpheaders-ui.c	Fri Apr 11 21:05:41 2008
@@ -26,8 +26,7 @@
 #include "ephy-gui.h"
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-embed-single.h>
-#include <epiphany/ephy-shell.h>
+#include <epiphany/epiphany.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtkdialog.h>

Modified: trunk/extensions/livehttpheaders/livehttpheaders-ui.h
==============================================================================
--- trunk/extensions/livehttpheaders/livehttpheaders-ui.h	(original)
+++ trunk/extensions/livehttpheaders/livehttpheaders-ui.h	Fri Apr 11 21:05:41 2008
@@ -21,7 +21,7 @@
 #ifndef LIVEHTTPHEADERS_H
 #define LIVEHTTPHEADERS_H
 
-#include <epiphany/ephy-dialog.h>
+#include <epiphany/epiphany.h>
 
 #include <glib.h>
 #include <glib-object.h>

Modified: trunk/extensions/page-info/ephy-page-info-extension.c
==============================================================================
--- trunk/extensions/page-info/ephy-page-info-extension.c	(original)
+++ trunk/extensions/page-info/ephy-page-info-extension.c	Fri Apr 11 21:05:41 2008
@@ -24,11 +24,7 @@
 #include "ephy-debug.h"
 #include "page-info-dialog.h"
 
-#include <epiphany/ephy-extension.h>
-#include <epiphany/ephy-window.h>
-#include <epiphany/ephy-embed.h>
-#include <epiphany/ephy-embed-container.h>
-#include <epiphany/ephy-notebook.h>
+#include <epiphany/epiphany.h>
 
 #include <gtk/gtkaction.h>
 #include <gtk/gtkactiongroup.h>

Modified: trunk/extensions/page-info/mozilla/mozilla-helpers.h
==============================================================================
--- trunk/extensions/page-info/mozilla/mozilla-helpers.h	(original)
+++ trunk/extensions/page-info/mozilla/mozilla-helpers.h	Fri Apr 11 21:05:41 2008
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 
-#include <epiphany/ephy-embed.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/page-info/page-info-dialog.c
==============================================================================
--- trunk/extensions/page-info/page-info-dialog.c	(original)
+++ trunk/extensions/page-info/page-info-dialog.c	Fri Apr 11 21:05:41 2008
@@ -31,13 +31,7 @@
 #include "page-info-dialog.h"
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-embed-persist.h>
-#include <epiphany/ephy-embed-factory.h>
-#include <epiphany/ephy-state.h>
-#include <epiphany/ephy-adblock-manager.h>
-#include <ephy-dnd.h>
-#include <epiphany/ephy-embed-shell.h>
-#include <epiphany/ephy-adblock-manager.h>
+#include <epiphany/epiphany.h>
 
 /* non-installed ephy headers */
 #include "ephy-gui.h"

Modified: trunk/extensions/page-info/page-info-dialog.h
==============================================================================
--- trunk/extensions/page-info/page-info-dialog.h	(original)
+++ trunk/extensions/page-info/page-info-dialog.h	Fri Apr 11 21:05:41 2008
@@ -24,9 +24,7 @@
 #ifndef PAGE_INFO_DIALOG_H
 #define PAGE_INFO_DIALOG_H
 
-#include <epiphany/ephy-dialog.h>
-#include <epiphany/ephy-embed.h>
-#include <epiphany/ephy-window.h>
+#include <epiphany/epiphany.h>
 
 #include <glib.h>
 

Modified: trunk/extensions/permissions/ephy-permissions-dialog.c
==============================================================================
--- trunk/extensions/permissions/ephy-permissions-dialog.c	(original)
+++ trunk/extensions/permissions/ephy-permissions-dialog.c	Fri Apr 11 21:05:41 2008
@@ -24,9 +24,7 @@
 
 #include "ephy-permissions-dialog.h"
 
-#include <epiphany/ephy-shell.h>
-#include <epiphany/ephy-permission-manager.h>
-#include <epiphany/ephy-state.h>
+#include <epiphany/epiphany.h>
 
 #include "ephy-debug.h"
 

Modified: trunk/extensions/permissions/ephy-permissions-extension.c
==============================================================================
--- trunk/extensions/permissions/ephy-permissions-extension.c	(original)
+++ trunk/extensions/permissions/ephy-permissions-extension.c	Fri Apr 11 21:05:41 2008
@@ -26,8 +26,7 @@
 
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-window.h>
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtkwidget.h>

Modified: trunk/extensions/push-scroller/ephy-push-scroller-extension.c
==============================================================================
--- trunk/extensions/push-scroller/ephy-push-scroller-extension.c	(original)
+++ trunk/extensions/push-scroller/ephy-push-scroller-extension.c	Fri Apr 11 21:05:41 2008
@@ -26,7 +26,7 @@
 #include "ephy-push-scroller.h"
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
 
 #include <gmodule.h>
 

Modified: trunk/extensions/push-scroller/ephy-push-scroller.h
==============================================================================
--- trunk/extensions/push-scroller/ephy-push-scroller.h	(original)
+++ trunk/extensions/push-scroller/ephy-push-scroller.h	Fri Apr 11 21:05:41 2008
@@ -25,8 +25,8 @@
 
 #include <glib-object.h>
 #include <gtk/gtkwidget.h>
-#include <epiphany/ephy-embed.h>
-#include <epiphany/ephy-window.h>
+
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/rss/ephy-rss-extension.c
==============================================================================
--- trunk/extensions/rss/ephy-rss-extension.c	(original)
+++ trunk/extensions/rss/ephy-rss-extension.c	Fri Apr 11 21:05:41 2008
@@ -26,13 +26,7 @@
 
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-extension.h>
-#include <epiphany/ephy-dialog.h>
-#include <epiphany/ephy-window.h>
-#include <epiphany/ephy-statusbar.h>
-#include <epiphany/ephy-notebook.h>
-#include <epiphany/ephy-shell.h>
-#include <epiphany/ephy-embed-container.h>
+#include <epiphany/epiphany.h>
 
 #include <gtk/gtkaction.h>
 #include <gtk/gtkactiongroup.h>

Modified: trunk/extensions/rss/rss-ui.h
==============================================================================
--- trunk/extensions/rss/rss-ui.h	(original)
+++ trunk/extensions/rss/rss-ui.h	Fri Apr 11 21:05:41 2008
@@ -24,10 +24,7 @@
 #include "ephy-rss-extension.h"
 #include "rss-feedlist.h"
 
-#include <epiphany/ephy-dialog.h>
-#include <epiphany/ephy-dbus.h>
-#include <epiphany/ephy-shell.h>
-#include <epiphany/ephy-embed.h>
+#include <epiphany/epiphany.h>
 
 #include <glib.h>
 #include <glib-object.h>

Modified: trunk/extensions/sample-mozilla/ephy-sample2-extension.c
==============================================================================
--- trunk/extensions/sample-mozilla/ephy-sample2-extension.c	(original)
+++ trunk/extensions/sample-mozilla/ephy-sample2-extension.c	Fri Apr 11 21:05:41 2008
@@ -25,7 +25,7 @@
 #include "mozilla-sample.h"
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
 
 #include <glib/gi18n-lib.h>
 #include <gmodule.h>

Modified: trunk/extensions/sample/ephy-sample-extension.c
==============================================================================
--- trunk/extensions/sample/ephy-sample-extension.c	(original)
+++ trunk/extensions/sample/ephy-sample-extension.c	Fri Apr 11 21:05:41 2008
@@ -24,7 +24,7 @@
 #include "ephy-sample-extension.h"
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
 
 #include <gmodule.h>
 

Modified: trunk/extensions/select-stylesheet/ephy-css-menu.c
==============================================================================
--- trunk/extensions/select-stylesheet/ephy-css-menu.c	(original)
+++ trunk/extensions/select-stylesheet/ephy-css-menu.c	Fri Apr 11 21:05:41 2008
@@ -25,9 +25,7 @@
 
 #include "ephy-css-menu.h"
 
-#include <epiphany/ephy-window.h>
-#include <epiphany/ephy-embed.h>
-#include <epiphany/ephy-embed-container.h>
+#include <epiphany/epiphany.h>
 
 #include "ephy-debug.h"
 

Modified: trunk/extensions/select-stylesheet/ephy-css-menu.h
==============================================================================
--- trunk/extensions/select-stylesheet/ephy-css-menu.h	(original)
+++ trunk/extensions/select-stylesheet/ephy-css-menu.h	Fri Apr 11 21:05:41 2008
@@ -22,7 +22,7 @@
 #define EPHY_CSS_MENU_H
 
 #include <glib-object.h>
-#include <epiphany/ephy-window.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/select-stylesheet/ephy-select-stylesheet-extension.c
==============================================================================
--- trunk/extensions/select-stylesheet/ephy-select-stylesheet-extension.c	(original)
+++ trunk/extensions/select-stylesheet/ephy-select-stylesheet-extension.c	Fri Apr 11 21:05:41 2008
@@ -28,8 +28,7 @@
 #include "ephy-css-menu.h"
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-extension.h>
-#include <epiphany/ephy-window.h>
+#include <epiphany/epiphany.h>
 
 #define WINDOW_DATA_KEY	"EphyCSSMenuExtensionWindowData"
 #define CSS_MENU_KEY	"EphyCSSMenu"

Modified: trunk/extensions/select-stylesheet/mozilla/mozilla-helpers.h
==============================================================================
--- trunk/extensions/select-stylesheet/mozilla/mozilla-helpers.h	(original)
+++ trunk/extensions/select-stylesheet/mozilla/mozilla-helpers.h	Fri Apr 11 21:05:41 2008
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include <epiphany/ephy-embed.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/sidebar/ephy-sidebar-embed.c
==============================================================================
--- trunk/extensions/sidebar/ephy-sidebar-embed.c	(original)
+++ trunk/extensions/sidebar/ephy-sidebar-embed.c	Fri Apr 11 21:05:41 2008
@@ -23,12 +23,7 @@
 #include "ephy-sidebar-embed.h"
 #include "sidebar-commands.h"
 
-#include <epiphany/ephy-embed.h>
-#include <epiphany/ephy-shell.h>
-#include <epiphany/ephy-embed-event.h>
-#include <epiphany/ephy-embed-persist.h>
-#include <epiphany/ephy-embed-factory.h>
-#include <epiphany/ephy-command-manager.h>
+#include <epiphany/epiphany.h>
 
 #include "ephy-prefs.h"
 #include "ephy-debug.h"

Modified: trunk/extensions/sidebar/ephy-sidebar-embed.h
==============================================================================
--- trunk/extensions/sidebar/ephy-sidebar-embed.h	(original)
+++ trunk/extensions/sidebar/ephy-sidebar-embed.h	Fri Apr 11 21:05:41 2008
@@ -24,8 +24,7 @@
 #include <glib-object.h>
 #include <gtk/gtkbin.h>
 
-#include <epiphany/ephy-embed.h>
-#include <epiphany/ephy-window.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/sidebar/ephy-sidebar-extension.c
==============================================================================
--- trunk/extensions/sidebar/ephy-sidebar-extension.c	(original)
+++ trunk/extensions/sidebar/ephy-sidebar-extension.c	Fri Apr 11 21:05:41 2008
@@ -26,14 +26,7 @@
 #include "ephy-sidebar-embed.h"
 #include "ephy-sidebar.h"
 
-#include <epiphany/ephy-extension.h>
-#include <epiphany/ephy-embed-shell.h>
-#include <epiphany/ephy-embed-single.h>
-#include <epiphany/ephy-shell.h>
-#include <epiphany/ephy-session.h>
-#include <epiphany/ephy-node.h>
-#include <epiphany/ephy-node-db.h>
-#include <epiphany/ephy-state.h>
+#include <epiphany/epiphany.h>
 
 #include "ephy-file-helpers.h"
 #include "ephy-gui.h"

Modified: trunk/extensions/sidebar/sidebar-commands.c
==============================================================================
--- trunk/extensions/sidebar/sidebar-commands.c	(original)
+++ trunk/extensions/sidebar/sidebar-commands.c	Fri Apr 11 21:05:41 2008
@@ -23,9 +23,7 @@
 
 #include "sidebar-commands.h"
 
-#include <epiphany/ephy-embed.h>
-#include <epiphany/ephy-embed-factory.h>
-#include <epiphany/ephy-embed-persist.h>
+#include <epiphany/epiphany.h>
 
 #include "ephy-prefs.h"
 

Modified: trunk/extensions/smart-bookmarks/mozilla/mozilla-selection.h
==============================================================================
--- trunk/extensions/smart-bookmarks/mozilla/mozilla-selection.h	(original)
+++ trunk/extensions/smart-bookmarks/mozilla/mozilla-selection.h	Fri Apr 11 21:05:41 2008
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include <epiphany/ephy-embed.h>
+#include <epiphany/epiphany.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/extensions/smart-bookmarks/smart-bookmarks-extension.c
==============================================================================
--- trunk/extensions/smart-bookmarks/smart-bookmarks-extension.c	(original)
+++ trunk/extensions/smart-bookmarks/smart-bookmarks-extension.c	Fri Apr 11 21:05:41 2008
@@ -23,14 +23,7 @@
 #include "smart-bookmarks-extension.h"
 #include "mozilla-selection.h"
 
-#include <epiphany/ephy-extension.h>
-#include <epiphany/ephy-embed.h>
-#include <epiphany/ephy-embed-container.h>
-#include <epiphany/ephy-command-manager.h>
-#include <epiphany/ephy-shell.h>
-#include <epiphany/ephy-session.h>
-#include <epiphany/ephy-node.h>
-#include <epiphany/ephy-bookmarks.h>
+#include <epiphany/epiphany.h>
 
 #include "eel-gconf-extensions.h"
 #include "ephy-debug.h"

Modified: trunk/extensions/tab-groups/ephy-tab-grouper.c
==============================================================================
--- trunk/extensions/tab-groups/ephy-tab-grouper.c	(original)
+++ trunk/extensions/tab-groups/ephy-tab-grouper.c	Fri Apr 11 21:05:41 2008
@@ -25,8 +25,7 @@
 #include "ephy-tab-grouper.h"
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-window.h>
-#include <epiphany/ephy-notebook.h>
+#include <epiphany/epiphany.h>
 
 #define EPHY_TAB_GROUPER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_TAB_GROUPER, EphyTabGrouperPrivate))
 

Modified: trunk/extensions/tab-groups/ephy-tab-groups-extension.c
==============================================================================
--- trunk/extensions/tab-groups/ephy-tab-groups-extension.c	(original)
+++ trunk/extensions/tab-groups/ephy-tab-groups-extension.c	Fri Apr 11 21:05:41 2008
@@ -26,7 +26,7 @@
 #include "ephy-tab-grouper.h"
 #include "ephy-debug.h"
 
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
 
 static void ephy_tab_groups_extension_class_init (EphyTabGroupsExtensionClass *class);
 static void ephy_tab_groups_extension_iface_init (EphyExtensionIface *iface);

Modified: trunk/extensions/tab-states/ephy-tab-states-extension.c
==============================================================================
--- trunk/extensions/tab-states/ephy-tab-states-extension.c	(original)
+++ trunk/extensions/tab-states/ephy-tab-states-extension.c	Fri Apr 11 21:05:41 2008
@@ -23,8 +23,8 @@
 
 #include "ephy-tab-states-extension.h"
 
-#include <epiphany/ephy-embed-container.h>
-#include <epiphany/ephy-extension.h>
+#include <epiphany/epiphany.h>
+
 #include "eel-gconf-extensions.h"
 #include "ephy-debug.h"