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

1 files changed, 15 insertions, 49 deletions

diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index f8ad2f8ed..d061c4896 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):