[epiphany] ephy-embed-single: remove non WebKit2 bits

[Xan Lopez <xan src gnome org>]

commit 88b08cad6a446fae4b78dc61c81c742b79da2e08
Author: Xan Lopez <xan igalia com>
Date:   Thu Mar 21 10:06:25 2013 +0100

    ephy-embed-single: remove non WebKit2 bits

 embed/ephy-embed-single.c |  205 ---------------------------------------------
 embed/ephy-embed-single.h |   13 ---
 2 files changed, 0 insertions(+), 218 deletions(-)
---
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index 4a61ddd..d8af4fd 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -27,9 +27,6 @@
 #include "ephy-embed-shell.h"
 #include "ephy-embed-type-builtins.h"
 #include "ephy-file-helpers.h"
-#ifndef HAVE_WEBKIT2
-#include "ephy-form-auth-data.h"
-#endif
 #include "ephy-prefs.h"
 #include "ephy-request-about.h"
 #include "ephy-settings.h"
@@ -38,87 +35,23 @@
 
 #include <glib/gi18n.h>
 #include <libsoup/soup.h>
-#ifdef HAVE_WEBKIT2
 #include <webkit2/webkit2.h>
-#else
-#include <webkit/webkit.h>
-#endif
 
 #define NSPLUGINWRAPPER_SETUP "/usr/bin/mozilla-plugin-config"
 
-struct _EphyEmbedSinglePrivate {
-#ifndef HAVE_WEBKIT2
-  EphyFormAuthDataCache *form_auth_data_cache;
-  SoupCache *cache;
-#endif
-};
-
 G_DEFINE_TYPE (EphyEmbedSingle, ephy_embed_single, G_TYPE_OBJECT)
 
-#ifndef HAVE_WEBKIT2
-static void
-ephy_embed_single_dispose (GObject *object)
-{
-  EphyEmbedSinglePrivate *priv = EPHY_EMBED_SINGLE (object)->priv;
-
-  if (priv->cache) {
-    soup_cache_flush (priv->cache);
-    soup_cache_dump (priv->cache);
-    g_object_unref (priv->cache);
-    priv->cache = NULL;
-  }
-
-  G_OBJECT_CLASS (ephy_embed_single_parent_class)->dispose (object);
-}
-
-static void
-ephy_embed_single_finalize (GObject *object)
-{
-  EphyEmbedSinglePrivate *priv = EPHY_EMBED_SINGLE (object)->priv;
-
-  ephy_form_auth_data_cache_free (priv->form_auth_data_cache);
-
-  G_OBJECT_CLASS (ephy_embed_single_parent_class)->finalize (object);
-}
-#endif
-
 static void
 ephy_embed_single_init (EphyEmbedSingle *single)
 {
-#ifndef HAVE_WEBKIT2
-  EphyEmbedSinglePrivate *priv;
-
-  single->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (single, EPHY_TYPE_EMBED_SINGLE, EphyEmbedSinglePrivate);
-
-  priv->form_auth_data_cache = ephy_form_auth_data_cache_new ();
-#endif
 }
 
 static void
 ephy_embed_single_class_init (EphyEmbedSingleClass *klass)
 {
-#ifndef HAVE_WEBKIT2
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = ephy_embed_single_finalize;
-  object_class->dispose = ephy_embed_single_dispose;
-
-  g_type_class_add_private (object_class, sizeof (EphyEmbedSinglePrivate));
-#endif
 }
 
-#ifndef HAVE_WEBKIT2
-static void
-cache_size_cb (GSettings *settings,
-               char *key,
-               EphyEmbedSingle *single)
-{
-  int new_cache_size = g_settings_get_int (settings, key);
-  soup_cache_set_max_size (single->priv->cache, new_cache_size * 1024 * 1024 /* in bytes */);
-}
-#endif
 
-#ifdef HAVE_WEBKIT2
 static void
 complete_about_request_for_contents (WebKitURISchemeRequest *request,
                                      gchar *data,
@@ -172,7 +105,6 @@ about_request_cb (WebKitURISchemeRequest *request,
     complete_about_request_for_contents (request, g_string_free (contents, FALSE), data_length);
   }
 }
-#endif
 
 /**
  * ephy_embed_single_initialize:
@@ -184,7 +116,6 @@ about_request_cb (WebKitURISchemeRequest *request,
 gboolean
 ephy_embed_single_initialize (EphyEmbedSingle *single)
 {
-#ifdef HAVE_WEBKIT2
   WebKitWebContext *web_context;
   WebKitCookieManager *cookie_manager;
   char *filename;
@@ -213,70 +144,6 @@ ephy_embed_single_initialize (EphyEmbedSingle *single)
                                           EPHY_ABOUT_SCHEME,
                                           about_request_cb,
                                           NULL, NULL);
-#else
-  SoupSession *session;
-  SoupCookieJar *jar;
-  char *filename;
-  char *cookie_policy;
-  char *cache_dir;
-  char *favicon_db_path;
-  EphyEmbedSinglePrivate *priv = single->priv;
-  EphyEmbedShellMode mode;
-
-  /* Initialise nspluginwrapper's plugins if available */
-  if (g_file_test (NSPLUGINWRAPPER_SETUP, G_FILE_TEST_EXISTS) != FALSE)
-    g_spawn_command_line_sync (NSPLUGINWRAPPER_SETUP, NULL, NULL, NULL, NULL);
-
-  session = webkit_get_default_session ();
-
-  /* Check SSL certificates */
-  g_object_set (session,
-                SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
-                SOUP_SESSION_SSL_STRICT, FALSE,
-                NULL);
-
-  /* Store cookies in moz-compatible SQLite format */
-  filename = g_build_filename (ephy_dot_dir (), "cookies.sqlite", NULL);
-  jar = soup_cookie_jar_db_new (filename, FALSE);
-  g_free (filename);
-  cookie_policy = g_settings_get_string (EPHY_SETTINGS_WEB,
-                                         EPHY_PREFS_WEB_COOKIES_POLICY);
-  ephy_embed_prefs_set_cookie_jar_policy (jar, cookie_policy);
-  g_free (cookie_policy);
-
-  soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar));
-  g_object_unref (jar);
-
-  /* Use GNOME proxy settings through libproxy. */
-  soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_DEFAULT);
-
-  mode = ephy_embed_shell_get_mode (ephy_embed_shell_get_default ());
-
-  /* WebKitSoupCache */
-  cache_dir = g_build_filename (EPHY_EMBED_SHELL_MODE_HAS_PRIVATE_PROFILE (mode) ?
-                                ephy_dot_dir () : g_get_user_cache_dir (),
-                                g_get_prgname (), NULL);
-  priv->cache = soup_cache_new (cache_dir, SOUP_CACHE_SINGLE_USER);
-  g_free (cache_dir);
-
-  soup_session_add_feature (session, SOUP_SESSION_FEATURE (priv->cache));
-  /* Cache size in Mb: 1024 * 1024 */
-  soup_cache_set_max_size (priv->cache, g_settings_get_int (EPHY_SETTINGS_WEB, EPHY_PREFS_CACHE_SIZE) << 20);
-  soup_cache_load (priv->cache);
-
-  g_signal_connect (EPHY_SETTINGS_WEB,
-                    "changed::" EPHY_PREFS_CACHE_SIZE,
-                    G_CALLBACK (cache_size_cb),
-                    single);
-
-  /* about: URIs handler */
-  soup_session_add_feature_by_type (session, EPHY_TYPE_REQUEST_ABOUT);
-
-  /* Initialize the favicon cache. */
-  favicon_db_path = g_build_filename (g_get_user_data_dir (), g_get_prgname (), NULL);
-  webkit_favicon_database_set_path (webkit_get_favicon_database (), favicon_db_path);
-  g_free (favicon_db_path);
-#endif
   return TRUE;
 }
 
@@ -289,77 +156,5 @@ ephy_embed_single_initialize (EphyEmbedSingle *single)
 void
 ephy_embed_single_clear_cache (EphyEmbedSingle *single)
 {
-#ifdef HAVE_WEBKIT2
   webkit_web_context_clear_cache (webkit_web_context_get_default ());
-#else
-  soup_cache_clear (single->priv->cache);
-#endif
-}
-
-/**
- * ephy_embed_single_get_form_auth:
- * @single: an #EphyEmbedSingle
- * @uri: the URI of a web page
- * 
- * Gets a #GSList of all stored login/passwords, in
- * #EphyFormAuthData format, for any form in @uri, or %NULL
- * if we have none.
- * 
- * The #EphyFormAuthData structs and the #GSList are owned
- * by @single and should not be freed by the user.
- * 
- * Returns: (transfer none) (element-type EphyFormAuthData): #GSList with the possible auto-fills for the 
forms
- * in @uri, or %NULL
- **/
-GSList *
-ephy_embed_single_get_form_auth (EphyEmbedSingle *single,
-                                 const char *uri)
-{
-#ifndef HAVE_WEBKIT2
-  EphyEmbedSinglePrivate *priv;
-
-  g_return_val_if_fail (EPHY_IS_EMBED_SINGLE (single), NULL);
-
-  priv = single->priv;
-
-  return ephy_form_auth_data_cache_get_list (priv->form_auth_data_cache, uri);
-#else
-  g_assert_not_reached();
-  return NULL;
-#endif
-}
-
-/**
- * ephy_embed_single_add_form_auth:
- * @single: an #EphyEmbedSingle
- * @uri: URI of the page
- * @form_username: name of the username input field
- * @form_password: name of the password input field
- * @username: username
- * 
- * Adds a new entry to the local cache of form auth data stored in
- * @single.
- * 
- **/
-void
-ephy_embed_single_add_form_auth (EphyEmbedSingle *single,
-                                 const char *uri,
-                                 const char *form_username,
-                                 const char *form_password,
-                                 const char *username)
-{
-#ifndef HAVE_WEBKIT2
-  EphyEmbedSinglePrivate *priv;
-
-  g_return_if_fail (EPHY_IS_EMBED_SINGLE (single));
-
-  priv = single->priv;
-
-  LOG ("Appending: name field: %s / pass field: %s / username: %s / uri: %s", form_username, form_password, 
username, uri);
-
-  ephy_form_auth_data_cache_add (priv->form_auth_data_cache,
-                                 uri, form_username, form_password, username);
-#else
-  g_assert_not_reached ();
-#endif
 }
diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h
index 79f4116..1e2b032 100644
--- a/embed/ephy-embed-single.h
+++ b/embed/ephy-embed-single.h
@@ -39,13 +39,9 @@ G_BEGIN_DECLS
 
 typedef struct _EphyEmbedSingle   EphyEmbedSingle;
 typedef struct _EphyEmbedSingleClass    EphyEmbedSingleClass;
-typedef struct _EphyEmbedSinglePrivate  EphyEmbedSinglePrivate;
 
 struct _EphyEmbedSingle {
   GObject parent;
-
-  /*< private >*/
-  EphyEmbedSinglePrivate *priv;
 };
 
 struct _EphyEmbedSingleClass
@@ -59,15 +55,6 @@ gboolean        ephy_embed_single_initialize         (EphyEmbedSingle *single);
 
 void            ephy_embed_single_clear_cache        (EphyEmbedSingle *single);
 
-GSList *        ephy_embed_single_get_form_auth      (EphyEmbedSingle *single,
-                                                      const char *uri);
-
-void            ephy_embed_single_add_form_auth      (EphyEmbedSingle *single,
-                                                      const char *uri,
-                                                      const char *form_username,
-                                                      const char *form_password,
-                                                      const char *username);
-
 G_END_DECLS
 
 #endif