From a06498057762d695d044584d76fb388650a10e12 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Sat, 23 Mar 2013 20:57:31 +0100 Subject: Get rid of EphyEmbedSingle Move the remaining initialization code to EphyEmbedShell https://bugzilla.gnome.org/show_bug.cgi?id=693703 --- embed/Makefile.am | 2 - embed/ephy-embed-shell.c | 147 ++++++++++++++++++++++++---------------- embed/ephy-embed-shell.h | 4 -- embed/ephy-embed-single.c | 149 ----------------------------------------- embed/ephy-embed-single.h | 58 ---------------- embed/ephy-web-view.c | 1 - src/ephy-shell.c | 1 - src/ephy-window.c | 1 - src/pdm-dialog.c | 6 -- src/prefs-dialog.c | 1 - src/window-commands.c | 1 - tests/Makefile.am | 4 -- tests/ephy-embed-single-test.c | 115 ------------------------------- 13 files changed, 88 insertions(+), 402 deletions(-) delete mode 100644 embed/ephy-embed-single.c delete mode 100644 embed/ephy-embed-single.h delete mode 100644 tests/ephy-embed-single-test.c diff --git a/embed/Makefile.am b/embed/Makefile.am index 1d1ea0899..44aa8b11b 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -19,7 +19,6 @@ INST_H_FILES = \ ephy-embed-container.h \ ephy-embed-event.h \ ephy-embed-prefs.h \ - ephy-embed-single.h \ ephy-embed-shell.h \ ephy-embed-utils.h \ ephy-overview.h \ @@ -37,7 +36,6 @@ libephyembed_la_SOURCES = \ ephy-embed-container.c \ ephy-embed-dialog.c \ ephy-embed-event.c \ - ephy-embed-single.c \ ephy-embed-shell.c \ ephy-embed-utils.c \ ephy-encoding.c \ diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index ba6c840e3..ab7341906 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -22,15 +22,18 @@ #include #include "ephy-embed-shell.h" +#include "ephy-about-handler.h" #include "ephy-debug.h" #include "ephy-download.h" +#include "ephy-embed-prefs.h" #include "ephy-embed-private.h" -#include "ephy-embed-single.h" #include "ephy-embed-type-builtins.h" #include "ephy-encodings.h" #include "ephy-file-helpers.h" #include "ephy-history-service.h" #include "ephy-profile-utils.h" +#include "ephy-request-about.h" +#include "ephy-settings.h" #include "ephy-snapshot-service.h" #include "ephy-web-extension.h" @@ -40,6 +43,7 @@ #define PAGE_SETUP_FILENAME "page-setup-gtk.ini" #define PRINT_SETTINGS_FILENAME "print-settings.ini" +#define NSPLUGINWRAPPER_SETUP "/usr/bin/mozilla-plugin-config" #define EPHY_EMBED_SHELL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_EMBED_SHELL, EphyEmbedShellPrivate)) @@ -47,13 +51,11 @@ struct _EphyEmbedShellPrivate { EphyHistoryService *global_history_service; GList *downloads; - EphyEmbedSingle *embed_single; EphyEncodings *encodings; GtkPageSetup *page_setup; GtkPrintSettings *print_settings; EphyEmbedShellMode mode; EphyFrecentStore *frecent_store; - guint single_initialised : 1; GDBusProxy *web_extension; guint web_extension_watch_name_id; guint web_extension_form_auth_save_signal_id; @@ -96,7 +98,6 @@ ephy_embed_shell_dispose (GObject *object) g_clear_object (&priv->print_settings); g_clear_object (&priv->frecent_store); g_clear_object (&priv->global_history_service); - g_clear_object (&priv->embed_single); if (priv->web_extension_watch_name_id > 0) { g_bus_unwatch_name (priv->web_extension_watch_name_id); priv->web_extension_watch_name_id = 0; @@ -290,59 +291,6 @@ ephy_embed_shell_get_frecent_store (EphyEmbedShell *shell) return shell->priv->frecent_store; } -static GObject * -impl_get_embed_single (EphyEmbedShell *shell) -{ - EphyEmbedShellPrivate *priv; - - g_return_val_if_fail (EPHY_IS_EMBED_SHELL (shell), NULL); - - priv = shell->priv; - - if (priv->embed_single != NULL && - !priv->single_initialised) { - g_warning ("ephy_embed_shell_get_embed_single called while the single is being initialised!\n"); - return G_OBJECT (priv->embed_single); - } - - if (priv->embed_single == NULL) { - priv->embed_single = EPHY_EMBED_SINGLE (g_object_new (EPHY_TYPE_EMBED_SINGLE, NULL)); - g_assert (priv->embed_single != NULL); - - if (!ephy_embed_single_initialize (priv->embed_single)) { - GtkWidget *dialog; - - dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - _("Epiphany can't be used now. " - "Initialization failed.")); - gtk_dialog_run (GTK_DIALOG (dialog)); - - exit (0); - } - - priv->single_initialised = TRUE; - } - - return G_OBJECT (shell->priv->embed_single); -} - -/** - * ephy_embed_shell_get_embed_single: - * @shell: the #EphyEmbedShell - * - * Return value: (transfer none): - **/ -GObject * -ephy_embed_shell_get_embed_single (EphyEmbedShell *shell) -{ - EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); - - return klass->get_embed_single (shell); -} - /** * ephy_embed_shell_get_encodings: * @shell: the #EphyEmbedShell @@ -406,9 +354,68 @@ ephy_embed_shell_get_property (GObject *object, } } +static void +complete_about_request_for_contents (WebKitURISchemeRequest *request, + gchar *data, + gsize data_length) +{ + GInputStream *stream; + + stream = g_memory_input_stream_new_from_data (data, data_length, g_free); + webkit_uri_scheme_request_finish (request, stream, data_length, "text/html"); + g_object_unref (stream); +} + +static void +get_plugins_cb (WebKitWebContext *web_context, + GAsyncResult *result, + WebKitURISchemeRequest *request) +{ + GList *plugins; + GString *data_str; + gsize data_length; + + data_str = g_string_new(""); + plugins = webkit_web_context_get_plugins_finish (web_context, result, NULL); + _ephy_about_handler_handle_plugins (data_str, plugins); + g_string_append (data_str, ""); + + data_length = data_str->len; + complete_about_request_for_contents (request, g_string_free (data_str, FALSE), data_length); + g_object_unref (request); +} + +static void +about_request_cb (WebKitURISchemeRequest *request, + gpointer user_data) +{ + const gchar *path; + + path = webkit_uri_scheme_request_get_path (request); + if (!g_strcmp0 (path, "plugins")) { + /* Plugins API is async in WebKit2 */ + webkit_web_context_get_plugins (webkit_web_context_get_default (), + NULL, + (GAsyncReadyCallback)get_plugins_cb, + g_object_ref (request)); + } else { + GString *contents; + gsize data_length; + + contents = ephy_about_handler_handle (path); + data_length = contents->len; + complete_about_request_for_contents (request, g_string_free (contents, FALSE), data_length); + } +} + static void ephy_embed_shell_init (EphyEmbedShell *shell) { + WebKitWebContext *web_context; + WebKitCookieManager *cookie_manager; + char *filename; + char *cookie_policy; + shell->priv = EPHY_EMBED_SHELL_GET_PRIVATE (shell); /* globally accessible singleton */ @@ -417,6 +424,30 @@ ephy_embed_shell_init (EphyEmbedShell *shell) shell->priv->downloads = NULL; + /* 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); + + web_context = webkit_web_context_get_default (); + + /* Store cookies in moz-compatible SQLite format */ + cookie_manager = webkit_web_context_get_cookie_manager (web_context); + filename = g_build_filename (ephy_dot_dir (), "cookies.sqlite", NULL); + webkit_cookie_manager_set_persistent_storage (cookie_manager, filename, + WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE); + g_free (filename); + + cookie_policy = g_settings_get_string (EPHY_SETTINGS_WEB, + EPHY_PREFS_WEB_COOKIES_POLICY); + ephy_embed_prefs_set_cookie_accept_policy (cookie_manager, cookie_policy); + g_free (cookie_policy); + + /* about: URIs handler */ + webkit_web_context_register_uri_scheme (web_context, + EPHY_ABOUT_SCHEME, + about_request_cb, + NULL, NULL); + ephy_embed_shell_watch_web_extension (shell); } @@ -430,8 +461,6 @@ ephy_embed_shell_class_init (EphyEmbedShellClass *klass) object_class->set_property = ephy_embed_shell_set_property; object_class->get_property = ephy_embed_shell_get_property; - klass->get_embed_single = impl_get_embed_single; - object_properties[PROP_MODE] = g_param_spec_enum ("mode", "Mode", diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h index 169d8757c..37bcb9c9e 100644 --- a/embed/ephy-embed-shell.h +++ b/embed/ephy-embed-shell.h @@ -73,16 +73,12 @@ struct _EphyEmbedShellClass void (* prepare_close) (EphyEmbedShell *shell); void (* restored_window) (EphyEmbedShell *shell); - - /*< private >*/ - GObject * (* get_embed_single) (EphyEmbedShell *shell); }; GType ephy_embed_shell_get_type (void); EphyEmbedShell *ephy_embed_shell_get_default (void); GObject *ephy_embed_shell_get_global_history_service (EphyEmbedShell *shell); GObject *ephy_embed_shell_get_encodings (EphyEmbedShell *shell); -GObject *ephy_embed_shell_get_embed_single (EphyEmbedShell *shell); void ephy_embed_shell_prepare_close (EphyEmbedShell *shell); void ephy_embed_shell_restored_window (EphyEmbedShell *shell); void ephy_embed_shell_set_page_setup (EphyEmbedShell *shell, diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c deleted file mode 100644 index f9f8bc7c4..000000000 --- a/embed/ephy-embed-single.c +++ /dev/null @@ -1,149 +0,0 @@ -/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */ -/* - * Copyright © 2000-2003 Marco Pesenti Gritti - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "config.h" -#include "ephy-embed-single.h" - -#include "ephy-about-handler.h" -#include "ephy-debug.h" -#include "ephy-embed-prefs.h" -#include "ephy-embed-shell.h" -#include "ephy-embed-type-builtins.h" -#include "ephy-file-helpers.h" -#include "ephy-prefs.h" -#include "ephy-request-about.h" -#include "ephy-settings.h" -#include "ephy-signal-accumulator.h" -#include "ephy-string.h" - -#include -#include -#include - -#define NSPLUGINWRAPPER_SETUP "/usr/bin/mozilla-plugin-config" - -G_DEFINE_TYPE (EphyEmbedSingle, ephy_embed_single, G_TYPE_OBJECT) - -static void -ephy_embed_single_init (EphyEmbedSingle *single) -{ -} - -static void -ephy_embed_single_class_init (EphyEmbedSingleClass *klass) -{ -} - - -static void -complete_about_request_for_contents (WebKitURISchemeRequest *request, - gchar *data, - gsize data_length) -{ - GInputStream *stream; - - stream = g_memory_input_stream_new_from_data (data, data_length, g_free); - webkit_uri_scheme_request_finish (request, stream, data_length, "text/html"); - g_object_unref (stream); -} - -static void -get_plugins_cb (WebKitWebContext *web_context, - GAsyncResult *result, - WebKitURISchemeRequest *request) -{ - GList *plugins; - GString *data_str; - gsize data_length; - - data_str = g_string_new(""); - plugins = webkit_web_context_get_plugins_finish (web_context, result, NULL); - _ephy_about_handler_handle_plugins (data_str, plugins); - g_string_append (data_str, ""); - - data_length = data_str->len; - complete_about_request_for_contents (request, g_string_free (data_str, FALSE), data_length); - g_object_unref (request); -} - -static void -about_request_cb (WebKitURISchemeRequest *request, - gpointer user_data) -{ - const gchar *path; - - path = webkit_uri_scheme_request_get_path (request); - if (!g_strcmp0 (path, "plugins")) { - /* Plugins API is async in WebKit2 */ - webkit_web_context_get_plugins (webkit_web_context_get_default (), - NULL, - (GAsyncReadyCallback) get_plugins_cb, - g_object_ref (request)); - } else { - GString *contents; - gsize data_length; - - contents = ephy_about_handler_handle (path); - data_length = contents->len; - complete_about_request_for_contents (request, g_string_free (contents, FALSE), data_length); - } -} - -/** - * ephy_embed_single_initialize: - * @single: the #EphyEmbedSingle - * - * Performs startup initialisations. Must be called before calling - * any other methods. - **/ -gboolean -ephy_embed_single_initialize (EphyEmbedSingle *single) -{ - WebKitWebContext *web_context; - WebKitCookieManager *cookie_manager; - char *filename; - char *cookie_policy; - - /* 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); - - web_context = webkit_web_context_get_default (); - - /* Store cookies in moz-compatible SQLite format */ - cookie_manager = webkit_web_context_get_cookie_manager (web_context); - filename = g_build_filename (ephy_dot_dir (), "cookies.sqlite", NULL); - webkit_cookie_manager_set_persistent_storage (cookie_manager, filename, - WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE); - g_free (filename); - - cookie_policy = g_settings_get_string (EPHY_SETTINGS_WEB, - EPHY_PREFS_WEB_COOKIES_POLICY); - ephy_embed_prefs_set_cookie_accept_policy (cookie_manager, cookie_policy); - g_free (cookie_policy); - - /* about: URIs handler */ - webkit_web_context_register_uri_scheme (web_context, - EPHY_ABOUT_SCHEME, - about_request_cb, - NULL, NULL); - return TRUE; -} - diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h deleted file mode 100644 index 517a0b09b..000000000 --- a/embed/ephy-embed-single.h +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */ -/* - * Copyright © 2000-2003 Marco Pesenti Gritti - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only can be included directly." -#endif - -#ifndef EPHY_EMBED_SINGLE_H -#define EPHY_EMBED_SINGLE_H - -#include "ephy-embed.h" -#include "ephy-web-view.h" - -G_BEGIN_DECLS - -#define EPHY_TYPE_EMBED_SINGLE (ephy_embed_single_get_type ()) -#define EPHY_EMBED_SINGLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingle)) -#define EPHY_EMBED_SINGLE_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleIface)) -#define EPHY_IS_EMBED_SINGLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_EMBED_SINGLE)) -#define EPHY_IS_EMBED_SINGLE_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED_SINGLE)) -#define EPHY_EMBED_SINGLE_GET_IFACE(i) (G_TYPE_INSTANCE_GET_INTERFACE ((i), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleIface)) - -typedef struct _EphyEmbedSingle EphyEmbedSingle; -typedef struct _EphyEmbedSingleClass EphyEmbedSingleClass; - -struct _EphyEmbedSingle { - GObject parent; -}; - -struct _EphyEmbedSingleClass -{ - GObjectClass parent_class; -}; - -GType ephy_embed_single_get_type (void); - -gboolean ephy_embed_single_initialize (EphyEmbedSingle *single); - -G_END_DECLS - -#endif diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c index 7ce358e42..8307a0617 100644 --- a/embed/ephy-web-view.c +++ b/embed/ephy-web-view.c @@ -29,7 +29,6 @@ #include "ephy-embed-prefs.h" #include "ephy-embed-private.h" #include "ephy-embed-shell.h" -#include "ephy-embed-single.h" #include "ephy-embed-type-builtins.h" #include "ephy-embed-utils.h" #include "ephy-embed.h" diff --git a/src/ephy-shell.c b/src/ephy-shell.c index c53270ba8..9b3a9012e 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -28,7 +28,6 @@ #include "ephy-debug.h" #include "ephy-embed-container.h" #include "ephy-embed-prefs.h" -#include "ephy-embed-single.h" #include "ephy-embed-utils.h" #include "ephy-file-helpers.h" #include "ephy-gui.h" diff --git a/src/ephy-window.c b/src/ephy-window.c index 5b2b664fc..210588b25 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -33,7 +33,6 @@ #include "ephy-embed-container.h" #include "ephy-embed-prefs.h" #include "ephy-embed-shell.h" -#include "ephy-embed-single.h" #include "ephy-embed-type-builtins.h" #include "ephy-embed-utils.h" #include "ephy-encoding-menu.h" diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index d6a3279e6..4a09260b8 100644 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -1594,12 +1594,6 @@ static void pdm_dialog_finalize (GObject *object) { PdmDialog *dialog = EPHY_PDM_DIALOG (object); - GObject *single; - - single = ephy_embed_shell_get_embed_single (ephy_embed_shell_get_default ()); - - g_signal_handlers_disconnect_matched - (single, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, object); #ifdef HAVE_WEBKIT2 g_signal_handlers_disconnect_by_func (get_cookie_manager (), cookie_changed_cb, object); diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 8910cd71c..7a6b77d1a 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -28,7 +28,6 @@ #include "ephy-embed-container.h" #include "ephy-embed-prefs.h" #include "ephy-embed-shell.h" -#include "ephy-embed-single.h" #include "ephy-embed-utils.h" #include "ephy-encodings.h" #include "ephy-file-chooser.h" diff --git a/src/window-commands.c b/src/window-commands.c index 265582f92..9f61c27e4 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -31,7 +31,6 @@ #include "ephy-embed-container.h" #include "ephy-embed-prefs.h" #include "ephy-embed-shell.h" -#include "ephy-embed-single.h" #include "ephy-embed-utils.h" #include "ephy-embed.h" #include "ephy-favicon-helpers.h" diff --git a/tests/Makefile.am b/tests/Makefile.am index 6236ad3be..b69d60284 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,7 +5,6 @@ noinst_PROGRAMS = \ test-ephy-completion-model \ test-ephy-download \ test-ephy-embed-shell \ - test-ephy-embed-single \ test-ephy-embed-utils \ test-ephy-encodings \ test-ephy-file-helpers \ @@ -130,9 +129,6 @@ test_ephy_download_SOURCES = \ test_ephy_embed_shell_SOURCES = \ ephy-embed-shell-test.c -test_ephy_embed_single_SOURCES = \ - ephy-embed-single-test.c - test_ephy_embed_utils_SOURCES = \ ephy-embed-utils-test.c diff --git a/tests/ephy-embed-single-test.c b/tests/ephy-embed-single-test.c deleted file mode 100644 index be6c0ca7e..000000000 --- a/tests/ephy-embed-single-test.c +++ /dev/null @@ -1,115 +0,0 @@ -/* vim: set sw=2 ts=2 sts=2 et: */ -/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* - * ephy-embed-single-test.c - * This file is part of Epiphany - * - * Copyright © 2010 - Igalia S.L. - * - * Epiphany is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * Epiphany is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Epiphany; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301 USA - */ - -#include "config.h" -#include "ephy-debug.h" -#include "ephy-embed-single.h" -#include "ephy-embed-prefs.h" -#include "ephy-file-helpers.h" -#include "ephy-private.h" -#include "ephy-shell.h" -#include - -static void -test_embed_single_new (void) -{ - EphyEmbedSingle *single; - - single = EPHY_EMBED_SINGLE (g_object_new (EPHY_TYPE_EMBED_SINGLE, NULL)); - g_assert (EPHY_IS_EMBED_SINGLE (single)); - - g_object_unref (single); -} - -static void -test_embed_single_get_from_shell (void) -{ - EphyEmbedShell *embed_shell = ephy_embed_shell_get_default (); - EphyEmbedSingle *single; - - single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (embed_shell)); - g_assert (EPHY_IS_EMBED_SINGLE (single)); -} - -#ifndef HAVE_WEBKIT2 -static void -test_embed_single_form_auth (void) -{ - EphyEmbedSingle *single; - GSList *results = NULL; - - single = EPHY_EMBED_SINGLE (g_object_new (EPHY_TYPE_EMBED_SINGLE, NULL)); - g_assert (EPHY_IS_EMBED_SINGLE (single)); - - results = ephy_embed_single_get_form_auth (single, "gnome.org"); - g_assert_cmpint (g_slist_length (results), ==, 0); - - ephy_embed_single_add_form_auth (single, "gnome.org", - "form_username_field", "form_password_field", - "username"); - - results = ephy_embed_single_get_form_auth (single, "gnome.org"); - g_assert_cmpint (g_slist_length (results), ==, 1); - - results = ephy_embed_single_get_form_auth (single, "www.gnome.org"); - g_assert_cmpint (g_slist_length (results), ==, 0); - - g_object_unref (single); -} -#endif - -int -main (int argc, char *argv[]) -{ - int ret; - - gtk_test_init (&argc, &argv); - - ephy_debug_init (); - ephy_embed_prefs_init (); - _ephy_shell_create_instance (EPHY_EMBED_SHELL_MODE_TEST); - - if (!ephy_file_helpers_init (NULL, - EPHY_FILE_HELPERS_ENSURE_EXISTS | EPHY_FILE_HELPERS_PRIVATE_PROFILE, - NULL)) { - g_debug ("Something wrong happened with ephy_file_helpers_init()"); - return -1; - } - - g_test_add_func ("/embed/ephy-embed-single/new", - test_embed_single_new); - g_test_add_func ("/embed/ephy-embed-single/get_from_shell", - test_embed_single_get_from_shell); -#ifndef HAVE_WEBKIT2 - g_test_add_func ("/embed/ephy-embed-single/form_auth", - test_embed_single_form_auth); -#endif - - ret = g_test_run (); - - g_object_unref (ephy_shell_get_default ()); - ephy_file_helpers_shutdown (); - - return ret; -} -- cgit v1.2.3