[epiphany] Remove extensions support

From: Xan Lopez <xan src gnome org>
To: commits-list gnome org
Cc:
Subject: [epiphany] Remove extensions support
Date: Mon, 8 Oct 2012 14:19:54 +0000 (UTC)
commit 3beb3efa30181600fb756ca108f0b799b851871f
Author: Xan Lopez <xan igalia com>
Date:   Mon Oct 8 09:57:57 2012 -0400

    Remove extensions support
    
    This removes the old style extension support, you can read the
    rationale in the bug report.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=685630

 configure.ac                        |   20 -
 data/Makefile.am                    |    4 -
 data/epiphany.convert               |    1 -
 data/epiphany.m4                    |   75 ---
 data/epiphany.pc.in                 |    1 -
 data/org.gnome.epiphany.gschema.xml |    5 -
 doc/reference/Makefile.am           |    1 -
 lib/Makefile.am                     |    5 -
 lib/ephy-module.c                   |  222 -------
 lib/ephy-module.h                   |   52 --
 lib/ephy-prefs.h                    |    1 -
 lib/ephy-shlib-loader.c             |  245 --------
 lib/ephy-shlib-loader.h             |   60 --
 m4/introspection.m4                 |   94 ---
 src/Makefile.am                     |  114 ----
 src/ephy-extension.c                |   91 ---
 src/ephy-extension.h                |   79 ---
 src/ephy-extensions-manager.c       | 1159 -----------------------------------
 src/ephy-extensions-manager.h       |   92 ---
 src/ephy-main.c                     |    8 -
 src/ephy-session.c                  |    1 -
 src/ephy-shell.c                    |   64 +--
 src/ephy-shell.h                    |    2 -
 src/ephy-window.c                   |   21 -
 src/epiphany.h.in                   |    2 -
 src/resources/epiphany-ui.xml       |    1 -
 26 files changed, 15 insertions(+), 2405 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fd54c0e..dd3d826 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,23 +158,6 @@ AC_TYPE_SIZE_T
 
 AC_CHECK_HEADERS([X11/XF86keysym.h])
 
-EPIPHANY_FEATURES=
-
-# *********************
-# GObject Introspection
-# *********************
-
-GOBJECT_INTROSPECTION_CHECK([0.9.5])
-
-if test "$with_webkit2" = "no"; then
-   if test "$found_introspection" = "yes"; then
-      EPIPHANY_FEATURES="$EPIPHANY_FEATURES introspection"
-      AC_DEFINE([ENABLE_INTROSPECTION], [1], [Define to enable introspection support])
-   fi
-else
-   found_introspection=no
-fi
-
 # ***
 # NSS
 # ***
@@ -193,8 +176,6 @@ fi
 
 AM_CONDITIONAL([ENABLE_NSS],[test "$enable_nss" = "yes"])
 
-AC_SUBST([EPIPHANY_FEATURES])
-
 # *******************************
 # Add warning flags
 # *******************************
@@ -309,7 +290,6 @@ Epiphany was configured with the following options:
 	Build tests		   : $enable_tests
 	Code coverage		   : $enable_code_coverage
 
-	GObject introspection	   : $found_introspection
 	NSS support		   : $enable_nss
 	WebKit2			   : $with_webkit2
 "
diff --git a/data/Makefile.am b/data/Makefile.am
index 7b7b89c..1d0ea38 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -25,9 +25,6 @@ aboutdialog_DATA = about.ini
 mimepermissiondir = $(pkgdatadir)
 mimepermission_DATA = mime-types-permissions.xml
 
-m4datadir = $(datadir)/aclocal
-m4data_DATA = epiphany.m4
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = epiphany-$(EPIPHANY_API_VERSION).pc
 
@@ -70,7 +67,6 @@ EXTRA_DIST = \
 	$(pkgconfig_DATA)		\
 	$(xsl_DATA)			\
 	$(service_DATA)			\
-	$(m4data_DATA)			\
 	$(default_bookmarks_in_files)	\
 	$(gsettings_SCHEMAS)		\
 	$(convert_DATA)			\
diff --git a/data/epiphany.convert b/data/epiphany.convert
index 5ec7518..66b37af 100644
--- a/data/epiphany.convert
+++ b/data/epiphany.convert
@@ -9,7 +9,6 @@ keyword-search-url = /apps/epiphany/general/url_search
 managed-network = /apps/epiphany/general/managed_network
 enable-smooth-scrolling = /apps/epiphany/web/smooth_scroll
 enable-caret-browsing = /apps/epiphany/web/browse_with_caret
-enabled-extensions = /apps/epiphany/general/active_extensions
 
 [org.gnome.Epiphany.ui]
 always-show-tabs-bar = /apps/epiphany/general/always_show_tabs_bar
diff --git a/data/epiphany.pc.in b/data/epiphany.pc.in
index 5a27ef0..5dedeab 100644
--- a/data/epiphany.pc.in
+++ b/data/epiphany.pc.in
@@ -2,7 +2,6 @@ prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@/epiphany/@EPIPHANY_MAJOR@
-extensionsdir= libdir@/@PACKAGE@/@EPIPHANY_API_VERSION@/extensions
 loaderdir= libdir@/@PACKAGE@/@EPIPHANY_MAJOR@/loaders
 datarootdir= datarootdir@
 datadir= datadir@
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index f97681e..c94df5f 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -50,11 +50,6 @@
 			<default>false</default>
 			<summary>Enable smooth scrolling</summary>
 		</key>
-		<key type="as" name="enabled-extensions">
-			<default>['extensions-manager-ui' ]</default>
-			<summary>Active extensions</summary>
-			<description>Lists the active extensions.</description>
-		</key>
 		<key type="b" name="internal-view-source">
 			<default>true</default>
 			<summary>Don't use an external application to view page	source.</summary>
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 0af97d7..04b1aba 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -66,7 +66,6 @@ IGNORE_HFILES = \
 	ephy-completion-model.h \
 	ephy-encoding-dialog.h \
 	ephy-encoding-menu.h \
-	ephy-extension.h \
 	ephy-favicon-action.h \
 	ephy-favorites-menu.h \
 	ephy-history-window.h \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 62508b1..5992bf5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,13 +14,11 @@ NOINST_H_FILES = \
 	ephy-file-helpers.h			\
 	ephy-gui.h				\
 	ephy-langs.h				\
-	ephy-module.h				\
 	ephy-node-filter.h			\
 	ephy-node-common.h			\
 	ephy-object-helpers.h			\
 	ephy-prefs.h				\
 	ephy-profile-utils.h			\
-	ephy-shlib-loader.h			\
 	ephy-signal-accumulator.h		\
 	ephy-smaps.h				\
 	ephy-sqlite.h				\
@@ -53,7 +51,6 @@ libephymisc_la_SOURCES = \
 	ephy-gui.c				\
 	ephy-langs.c				\
 	ephy-loader.c				\
-	ephy-module.c				\
 	ephy-node.c				\
 	ephy-node.h				\
 	ephy-node-filter.c			\
@@ -64,7 +61,6 @@ libephymisc_la_SOURCES = \
 	ephy-profile-utils.c			\
 	ephy-profile-utils.h			\
 	ephy-settings.c				\
-	ephy-shlib-loader.c			\
 	ephy-signal-accumulator.c		\
 	ephy-smaps.c				\
 	ephy-snapshot-service.c			\
@@ -88,7 +84,6 @@ libephymisc_la_CPPFLAGS = \
 	-DSHARE_DIR=\"$(pkgdatadir)\" 		    \
 	-DTOP_SRC_DATADIR=\"$(top_srcdir)/data\"    \
 	-DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
-	-DEXTENSIONS_DIR=\""$(pkglibdir)/$(EPIPHANY_API_VERSION)/extensions"\" 	\
 	$(AM_CPPFLAGS)
 
 libephymisc_la_CFLAGS = \
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index ccc7238..b954583 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -122,7 +122,6 @@ typedef enum
 #define EPHY_PREFS_MANAGED_NETWORK                "managed-network"
 #define EPHY_PREFS_ENABLE_SMOOTH_SCROLLING        "enable-smooth-scrolling"
 #define EPHY_PREFS_ENABLE_CARET_BROWSING          "enable-caret-browsing"
-#define EPHY_PREFS_ENABLED_EXTENSIONS             "enabled-extensions"
 #define EPHY_PREFS_INTERNAL_VIEW_SOURCE           "internal-view-source"
 #define EPHY_PREFS_RESTORE_SESSION_POLICY         "restore-session-policy"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index ada8e47..b4618f7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,8 +40,6 @@ NOINST_H_FILES = \
 	window-commands.h
 
 INST_H_FILES = \
-	ephy-extension.h		\
-	ephy-extensions-manager.h	\
 	ephy-link.h			\
 	ephy-notebook.h			\
 	ephy-session.h			\
@@ -57,8 +55,6 @@ libephymain_la_SOURCES = \
 	ephy-combined-stop-reload-action.c	\
 	ephy-encoding-dialog.c			\
 	ephy-encoding-menu.c			\
-	ephy-extension.c			\
-	ephy-extensions-manager.c		\
 	ephy-find-toolbar.c			\
 	ephy-home-action.c			\
 	ephy-history-window.c			\
@@ -95,7 +91,6 @@ libephymain_la_CPPFLAGS = \
 	-I$(top_srcdir)/lib/history	\
 	-I$(top_srcdir)/lib/widgets   	\
 	-I$(top_srcdir)/src/bookmarks   \
-	-DEXTENSIONS_DIR=\""$(pkglibdir)/$(EPIPHANY_API_VERSION)/extensions"\" 	\
 	-DLOADER_DIR=\""$(pkglibdir)/$(EPIPHANY_MAJOR)/loaders"\"		\
 	-DDATADIR=\""$(pkgdatadir)"\" 	\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
@@ -172,13 +167,6 @@ epiphany_LDADD = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(LIBINTL)
 
-if !WITH_WEBKIT2
-if HAVE_INTROSPECTION
-epiphany_CFLAGS += $(INTROSPECTION_CFLAGS)
-epiphany_LDADD += $(INTROSPECTION_LIBS)
-endif
-endif
-
 TYPES_SOURCE = \
 	ephy-type-builtins.c	\
 	ephy-type-builtins.h
@@ -232,105 +220,3 @@ stamp-ephy-type-builtins.h: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
-
-if !WITH_WEBKIT2
-if HAVE_INTROSPECTION
-EPHY_GIR_H_FILES = \
-	$(top_srcdir)/embed/ephy-download.h \
-	$(top_srcdir)/embed/ephy-embed.h \
-	$(top_srcdir)/embed/ephy-embed-container.h \
-	$(top_srcdir)/embed/ephy-embed-event.h \
-	$(top_srcdir)/embed/ephy-embed-shell.h \
-	$(top_srcdir)/embed/ephy-embed-single.h \
-	$(top_srcdir)/embed/ephy-overview.h \
-	$(top_srcdir)/embed/ephy-permission-manager.h \
-	$(top_srcdir)/embed/ephy-web-view.h \
-	$(top_srcdir)/lib/ephy-dialog.h \
-	$(top_srcdir)/lib/ephy-node-db.h \
-	$(top_srcdir)/lib/ephy-node.h \
-	$(top_srcdir)/lib/ephy-state.h \
-	$(top_srcdir)/lib/widgets/ephy-download-widget.h \
-	$(top_srcdir)/lib/widgets/ephy-frecent-store.h \
-	$(top_srcdir)/lib/widgets/ephy-search-entry.h \
-	$(top_srcdir)/src/bookmarks/ephy-bookmarks.h \
-	$(top_srcdir)/src/ephy-extension.h \
-	$(top_srcdir)/src/ephy-extensions-manager.h \
-	$(top_srcdir)/src/ephy-find-toolbar.h \
-	$(top_srcdir)/src/ephy-link-action.h \
-	$(top_srcdir)/src/ephy-link.h \
-	$(top_srcdir)/src/ephy-location-controller.h \
-	$(top_srcdir)/src/ephy-notebook.h \
-	$(top_srcdir)/src/ephy-session.h \
-	$(top_srcdir)/src/ephy-shell.h \
-	$(top_srcdir)/src/ephy-window.h \
-	$(NULL)
-
-EPHY_GIR_C_FILES = \
-	$(top_srcdir)/embed/ephy-download.c \
-	$(top_srcdir)/embed/ephy-embed.c \
-	$(top_srcdir)/embed/ephy-embed-container.c \
-	$(top_srcdir)/embed/ephy-embed-event.c \
-	$(top_srcdir)/embed/ephy-embed-shell.c \
-	$(top_srcdir)/embed/ephy-embed-single.c \
-	$(top_srcdir)/embed/ephy-overview.c \
-	$(top_srcdir)/embed/ephy-permission-manager.c \
-	$(top_srcdir)/embed/ephy-web-view.c \
-	$(top_srcdir)/lib/ephy-dialog.c \
-	$(top_srcdir)/lib/ephy-node-db.c \
-	$(top_srcdir)/lib/ephy-node.c \
-	$(top_srcdir)/lib/ephy-state.c \
-	$(top_srcdir)/lib/widgets/ephy-download-widget.c \
-	$(top_srcdir)/lib/widgets/ephy-frecent-store.c \
-	$(top_srcdir)/lib/widgets/ephy-search-entry.c \
-	$(top_srcdir)/src/bookmarks/ephy-bookmarks.c \
-	$(top_srcdir)/src/ephy-extension.c \
-	$(top_srcdir)/src/ephy-extensions-manager.c \
-	$(top_srcdir)/src/ephy-find-toolbar.c \
-	$(top_srcdir)/src/ephy-link-action.c \
-	$(top_srcdir)/src/ephy-link.c \
-	$(top_srcdir)/src/ephy-location-controller.c \
-	$(top_srcdir)/src/ephy-notebook.c \
-	$(top_srcdir)/src/ephy-session.c \
-	$(top_srcdir)/src/ephy-shell.c \
-	$(top_srcdir)/src/ephy-window.c \
-	$(NULL)
-
-Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \
-                                      $(EPHY_GIR_C_FILES) epiphany
-	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
-	$(INTROSPECTION_SCANNER) -v --warn-all \
-		--identifier-prefix=Ephy \
-		--symbol-prefix=ephy \
-		--namespace=Epiphany \
-		--nsversion=$(EPIPHANY_API_VERSION) \
-		--add-include-path=. \
-		--add-include-path=$(srcdir) \
-		--include=Gtk-3.0 \
-		--include=libxml2-2.0 \
-		--include=WebKit-3.0 \
-		--program=./epiphany \
-		--output=$@ \
-		--pkg=epiphany-$(EPIPHANY_API_VERSION) \
-		-DEPIPHANY_COMPILATION \
-		-I$(top_srcdir)/embed \
-		-I$(top_srcdir)/lib \
-		-I$(top_srcdir)/lib/egg \
-		-I$(top_srcdir)/lib/widgets \
-		-I$(top_srcdir)/src \
-		-I$(top_srcdir)/src/bookmarks \
-		$(EPHY_GIR_H_FILES) \
-		$(EPHY_GIR_C_FILES)
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = Epiphany-$(EPIPHANY_API_VERSION).gir
-
-typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = Epiphany-$(EPIPHANY_API_VERSION).typelib
-
-Epiphany-$(EPIPHANY_API_VERSION).typelib: Epiphany-$(EPIPHANY_API_VERSION).gir $(INTROSPECTION_COMPILER)
-	$(AM_V_GEN) $(INTROSPECTION_COMPILER) Epiphany-$(EPIPHANY_API_VERSION).gir --includedir=$(top_builddir)/src --includedir=$(srcdir) -o Epiphany-$(EPIPHANY_API_VERSION).typelib
-
-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-
-endif # HAVE_INTROSPECTION
-endif # !WITH_WEBKIT2
diff --git a/src/ephy-main.c b/src/ephy-main.c
index b2fc704..d79d1ca 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -42,10 +42,6 @@
 #include <libxml/xmlversion.h>
 #include <string.h>
 
-#ifdef ENABLE_INTROSPECTION
-#include <girepository.h>
-#endif
-
 static GQuark startup_error_quark = 0;
 #define STARTUP_ERROR_QUARK (startup_error_quark)
 
@@ -331,10 +327,6 @@ main (int argc,
 
   g_option_context_set_main_group (option_context, option_group);
 
-#ifdef ENABLE_INTROSPECTION
-  g_option_context_add_group (option_context, g_irepository_get_option_group ());
-#endif
-
   g_option_context_add_group (option_context, gtk_get_option_group (TRUE));
 
 #ifdef GNOME_ENABLE_DEBUG
diff --git a/src/ephy-session.c b/src/ephy-session.c
index e7d1e34..70fc234 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -29,7 +29,6 @@
 #include "ephy-embed-container.h"
 #include "ephy-embed-utils.h"
 #include "ephy-embed.h"
-#include "ephy-extension.h"
 #include "ephy-file-helpers.h"
 #include "ephy-gui.h"
 #include "ephy-history-window.h"
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index f8ad2f8..d061c48 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -30,7 +30,6 @@
 #include "ephy-embed-container.h"
 #include "ephy-embed-single.h"
 #include "ephy-embed-utils.h"
-#include "ephy-extensions-manager.h"
 #include "ephy-file-helpers.h"
 #include "ephy-gui.h"
 #include "ephy-history-window.h"
@@ -57,7 +56,6 @@ struct _EphyShellPrivate {
   GList *windows;
   GObject *lockdown;
   EphyBookmarks *bookmarks;
-  EphyExtensionsManager *extensions_manager;
   GNetworkMonitor *network_monitor;
   GtkWidget *bme;
   GtkWidget *history_window;
@@ -592,6 +590,17 @@ download_started_cb (WebKitWebContext *web_context,
 }
 #endif
 
+static GObject *
+ephy_shell_get_lockdown (EphyShell *shell)
+{
+  g_return_val_if_fail (EPHY_IS_SHELL (shell), NULL);
+
+  if (shell->priv->lockdown == NULL)
+    shell->priv->lockdown = g_object_new (EPHY_TYPE_LOCKDOWN, NULL);
+
+  return G_OBJECT (shell->priv->session);
+}
+
 static void
 ephy_shell_init (EphyShell *shell)
 {
@@ -610,6 +619,10 @@ ephy_shell_init (EphyShell *shell)
                     G_CALLBACK (download_started_cb),
                     shell);
 #endif
+
+    /* FIXME */
+    ephy_shell_get_lockdown (shell);
+    ephy_embed_shell_get_adblock_manager (embed_shell);
 }
 
 static void
@@ -619,9 +632,6 @@ ephy_shell_dispose (GObject *object)
 
   LOG ("EphyShell disposing");
 
-  /* This will unload the extensions. */
-  g_clear_object (&priv->extensions_manager);
-
   g_clear_object (&priv->session);
   g_clear_object (&priv->lockdown);
   g_clear_pointer (&priv->bme, gtk_widget_destroy);
@@ -868,25 +878,6 @@ ephy_shell_get_session (EphyShell *shell)
 }
 
 /**
- * ephy_shell_get_lockdown:
- * @shell: the #EphyShell
- *
- * Returns the lockdown controller.
- *
- * Return value: the lockdown controller
- **/
-static GObject *
-ephy_shell_get_lockdown (EphyShell *shell)
-{
-  g_return_val_if_fail (EPHY_IS_SHELL (shell), NULL);
-
-  if (shell->priv->lockdown == NULL)
-    shell->priv->lockdown = g_object_new (EPHY_TYPE_LOCKDOWN, NULL);
-
-  return G_OBJECT (shell->priv->session);
-}
-
-/**
  * ephy_shell_get_bookmarks:
  *
  * Return value: (transfer none):
@@ -902,31 +893,6 @@ ephy_shell_get_bookmarks (EphyShell *shell)
 }
 
 /**
- * ephy_shell_get_extensions_manager:
- *
- * Return value: (transfer none):
- **/
-GObject *
-ephy_shell_get_extensions_manager (EphyShell *es)
-{
-  g_return_val_if_fail (EPHY_IS_SHELL (es), NULL);
-
-  if (es->priv->extensions_manager == NULL) {
-    /* Instantiate extensions manager */
-    es->priv->extensions_manager =
-      g_object_new (EPHY_TYPE_EXTENSIONS_MANAGER, NULL);
-
-    ephy_extensions_manager_startup (es->priv->extensions_manager);
-
-    /* FIXME */
-    ephy_shell_get_lockdown (es);
-    ephy_embed_shell_get_adblock_manager (embed_shell);
-  }
-
-  return G_OBJECT (es->priv->extensions_manager);
-}
-
-/**
  * ephy_shell_get_net_monitor:
  *
  * Return value: (transfer none):
diff --git a/src/ephy-shell.h b/src/ephy-shell.h
index 9e0a4c7..e9402e1 100644
--- a/src/ephy-shell.h
+++ b/src/ephy-shell.h
@@ -167,8 +167,6 @@ GObject        *ephy_shell_get_net_monitor              (EphyShell *shell);
 
 EphyBookmarks  *ephy_shell_get_bookmarks                (EphyShell *shell);
 
-GObject        *ephy_shell_get_extensions_manager       (EphyShell *shell);
-
 GtkWidget      *ephy_shell_get_bookmarks_editor         (EphyShell *shell);
 
 GtkWidget      *ephy_shell_get_history_window           (EphyShell *shell);
diff --git a/src/ephy-window.c b/src/ephy-window.c
index c84d0c6..6be58fe 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -37,7 +37,6 @@
 #include "ephy-embed-type-builtins.h"
 #include "ephy-embed-utils.h"
 #include "ephy-encoding-menu.h"
-#include "ephy-extension.h"
 #include "ephy-file-helpers.h"
 #include "ephy-find-toolbar.h"
 #include "ephy-gui.h"
@@ -94,7 +93,6 @@ static const GtkActionEntry ephy_menu_entries [] = {
 	{ "PopupAction", NULL, "" },
 	{ "PagePopupAction", NULL, "" },
 	{ "NotebookPopupAction", NULL, "" },
-	{ "Extensions", NULL, N_("_Extensions") },
 
 	/* File actions. */
 
@@ -2926,7 +2924,6 @@ notebook_page_added_cb (EphyNotebook *notebook,
 			EphyWindow *window)
 {
 	EphyWindowPrivate *priv = window->priv;
-	EphyExtension *manager;
 
 	LOG ("page-added notebook %p embed %p position %u\n", notebook, embed, position);
 
@@ -2941,10 +2938,6 @@ notebook_page_added_cb (EphyNotebook *notebook,
 	g_signal_connect_object (ephy_embed_get_web_view (embed), "ge-modal-alert",
 				 G_CALLBACK (embed_modal_alert_cb), window, G_CONNECT_AFTER);
 
-	/* Let the extensions attach themselves to the tab */
-	manager = EPHY_EXTENSION (ephy_shell_get_extensions_manager (ephy_shell));
-	ephy_extension_attach_tab (manager, window, embed);
-
         if (priv->present_on_insert)
         {
                 priv->present_on_insert = FALSE;
@@ -2961,7 +2954,6 @@ notebook_page_removed_cb (EphyNotebook *notebook,
 			  EphyWindow *window)
 {
 	EphyWindowPrivate *priv = window->priv;
-	EphyExtension *manager;
 
 	LOG ("page-removed notebook %p embed %p position %u\n", notebook, embed, position);
 
@@ -2969,10 +2961,6 @@ notebook_page_removed_cb (EphyNotebook *notebook,
 
 	g_return_if_fail (EPHY_IS_EMBED (embed));
 
-	/* Let the extensions remove themselves from the tab */
-	manager = EPHY_EXTENSION (ephy_shell_get_extensions_manager (ephy_shell));
-	ephy_extension_detach_tab (manager, window, embed);
-
 #if 0
 	g_signal_handlers_disconnect_by_func (G_OBJECT (embed),
 					      G_CALLBACK (ephy_link_open),
@@ -3233,13 +3221,8 @@ ephy_window_dispose (GObject *object)
 	/* Only do these once */
 	if (window->priv->closing == FALSE)
 	{
-		EphyExtension *manager;
-
 		window->priv->closing = TRUE;
 
-		/* Let the extensions detach themselves from the window */
-		manager = EPHY_EXTENSION (ephy_shell_get_extensions_manager (ephy_shell));
-		ephy_extension_detach_window (manager, window);
 		ephy_bookmarks_ui_detach_window (window);
 
 		g_signal_handlers_disconnect_by_func
@@ -3593,7 +3576,6 @@ ephy_window_constructor (GType type,
 	GObject *object;
 	EphyWindow *window;
 	EphyWindowPrivate *priv;
-	EphyExtension *manager;
 	EphyEmbedSingle *single;
 	GtkSettings *settings;
 	GtkAction *action;
@@ -3711,9 +3693,6 @@ ephy_window_constructor (GType type,
 	/* Initialize the menus */
 	priv->enc_menu = ephy_encoding_menu_new (window);
 
-	/* Once the window is sufficiently created let the extensions attach to it */
-	manager = EPHY_EXTENSION (ephy_shell_get_extensions_manager (ephy_shell));
-	ephy_extension_attach_window (manager, window);
 	ephy_bookmarks_ui_attach_window (window);
 
 	/* other notifiers */
diff --git a/src/epiphany.h.in b/src/epiphany.h.in
index 2f05648..d218f6c 100644
--- a/src/epiphany.h.in
+++ b/src/epiphany.h.in
@@ -47,8 +47,6 @@
 #include <epiphany/ephy-embed-single.h>
 #include <epiphany/ephy-embed-type-builtins.h>
 #include <epiphany/ephy-embed-utils.h>
-#include <epiphany/ephy-extension.h>
-#include <epiphany/ephy-extensions-manager.h>
 #include <epiphany/ephy-lib-type-builtins.h>
 #include <epiphany/ephy-link.h>
 #include <epiphany/ephy-loader.h>
diff --git a/src/resources/epiphany-ui.xml b/src/resources/epiphany-ui.xml
index 8b117c7..1c97429 100644
--- a/src/resources/epiphany-ui.xml
+++ b/src/resources/epiphany-ui.xml
@@ -95,7 +95,6 @@
                   <placeholder name="ViewEncodingPlaceholder"/>
                 </menu>
                 <menuitem name="ViewPageSourceMenu" action="ViewPageSource"/>
-		<menu name="ExtensionsMenu" action="Extensions"/>
                 <separator name="FileSep7"/>
                 <menuitem name="HelpAboutMenu" action="HelpAbout"/>
                 <menuitem name="FileCloseWindowMenu" action="FileCloseTab"/>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]