aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--embed/ephy-embed-single.c4
-rw-r--r--src/ephy-main.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index a9a2017c3..43f9b73b7 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -196,8 +196,6 @@ ephy_embed_single_finalize (GObject *object)
{
EphyEmbedSinglePrivate *priv = EPHY_EMBED_SINGLE (object)->priv;
- ephy_embed_prefs_shutdown ();
-
if (priv->form_auth_data) {
g_hash_table_foreach (priv->form_auth_data,
(GHFunc)remove_form_auth_data,
@@ -358,8 +356,6 @@ ephy_embed_single_initialize (EphyEmbedSingle *single)
if (g_file_test (NSPLUGINWRAPPER_SETUP, G_FILE_TEST_EXISTS) != FALSE)
g_spawn_command_line_sync (NSPLUGINWRAPPER_SETUP, NULL, NULL, NULL, NULL);
- ephy_embed_prefs_init ();
-
session = webkit_get_default_session ();
/* Check SSL certificates */
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 20aa1e5f2..04ba38a3c 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -23,6 +23,7 @@
#include "config.h"
#include "ephy-debug.h"
+#include "ephy-embed-prefs.h"
#include "ephy-file-helpers.h"
#include "ephy-session.h"
#include "ephy-settings.h"
@@ -467,6 +468,7 @@ main (int argc,
gtk_window_set_default_icon_name ("web-browser");
}
+ ephy_embed_prefs_init ();
_ephy_shell_create_instance (mode);
startup_flags = get_startup_flags ();
@@ -488,6 +490,7 @@ main (int argc,
ephy_file_save_accels ();
ephy_state_save ();
+ ephy_embed_prefs_shutdown ();
ephy_settings_shutdown ();
ephy_file_helpers_shutdown ();
xmlCleanupParser ();