From 27c169f074f0fb878f5d90078cf1aad11024e0ef Mon Sep 17 00:00:00 2001 From: Diego Escalante Urrelo Date: Sat, 31 Mar 2012 21:16:58 -0500 Subject: 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 --- src/ephy-main.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/ephy-main.c') 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 (); -- cgit v1.2.3