diff options
| author | Diego Escalante Urrelo <descalante@igalia.com> | 2010-07-25 07:59:55 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@gnome.org> | 2010-10-08 17:09:11 +0800 |
| commit | 5df7af9e3041102a5f5601d60faa11c38b48de75 (patch) | |
| tree | fe0306b87e0874a8541a082fe844f4a487331161 /embed/ephy-embed-single.c | |
| parent | 60d08f64c2466ce8eda20d832239ec6defc9ef06 (diff) | |
| download | gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.gz gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.zst gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.zip | |
gsettings: port epiphany to gsettings
Adds our own schemas, a migration file and removes old gconf API and files.
Bug #624485
Diffstat (limited to 'embed/ephy-embed-single.c')
| -rw-r--r-- | embed/ephy-embed-single.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c index 04ead3f57..560eb3431 100644 --- a/embed/ephy-embed-single.c +++ b/embed/ephy-embed-single.c @@ -23,8 +23,8 @@ #define LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY #define NSPLUGINWRAPPER_SETUP "/usr/bin/mozilla-plugin-config" -#include "eel-gconf-extensions.h" #include "ephy-embed-single.h" +#include "ephy-embed-shell.h" #include "ephy-embed-prefs.h" #include "ephy-embed-type-builtins.h" #include "ephy-debug.h" @@ -33,6 +33,8 @@ #include "ephy-signal-accumulator.h" #include "ephy-permission-manager.h" #include "ephy-profile-migration.h" +#include "ephy-prefs.h" +#include "ephy-settings.h" #ifdef ENABLE_CERTIFICATE_MANAGER #include "ephy-certificate-manager.h" @@ -480,7 +482,8 @@ ephy_embed_single_initialize (EphyEmbedSingle *single) filename = g_build_filename (ephy_dot_dir (), "cookies.sqlite", NULL); jar = soup_cookie_jar_sqlite_new (filename, FALSE); g_free (filename); - cookie_policy = eel_gconf_get_string (CONF_SECURITY_COOKIES_ACCEPT); + cookie_policy = g_settings_get_string (EPHY_SETTINGS_WEB, + EPHY_PREFS_WEB_COOKIES_POLICY); ephy_embed_prefs_set_cookie_jar_policy (jar, cookie_policy); g_free (cookie_policy); |