[epiphany] ephy-embed-single: do not handle ephy-embed-prefs

[Diego Escalante Urrelo <diegoe src gnome org>]

commit 27c169f074f0fb878f5d90078cf1aad11024e0ef
Author: Diego Escalante Urrelo <diegoe igalia com>
Date:   Sat Mar 31 21:16:58 2012 -0500

    ephy-embed-single: do not handle ephy-embed-prefs
    
    ephy-embed-prefs acts like a singleton.
    
    Instead of calling init and shutdown in EphyEmbedSingle instances handle
    it in ephy-main as a true init/shutdown API like ephy-file-helpers.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=673273

 embed/ephy-embed-single.c |    4 ----
 src/ephy-main.c           |    3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index a9a2017..43f9b73 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 20aa1e5..04ba38a 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 ();