diff options
author | Diego Escalante Urrelo <diegoe@igalia.com> | 2012-04-01 10:16:58 +0800 |
---|---|---|
committer | Diego Escalante Urrelo <diegoe@igalia.com> | 2012-04-11 03:33:40 +0800 |
commit | 27c169f074f0fb878f5d90078cf1aad11024e0ef (patch) | |
tree | 7b84479c3f6b33b7f6ca41345f185e36bdc40f05 /src | |
parent | d18ab773b3cc3b6c96554dcd6fc06468adb3c37e (diff) | |
download | gsoc2013-epiphany-27c169f074f0fb878f5d90078cf1aad11024e0ef.tar.gz gsoc2013-epiphany-27c169f074f0fb878f5d90078cf1aad11024e0ef.tar.zst gsoc2013-epiphany-27c169f074f0fb878f5d90078cf1aad11024e0ef.zip |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/ephy-main.c | 3 |
1 files changed, 3 insertions, 0 deletions
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 (); |