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 /src/ephy-session.c | |
| parent | 60d08f64c2466ce8eda20d832239ec6defc9ef06 (diff) | |
| download | gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.gz gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.bz2 gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.lz gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.xz 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 'src/ephy-session.c')
| -rw-r--r-- | src/ephy-session.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/ephy-session.c b/src/ephy-session.c index 9adf2dcfd..558793c6f 100644 --- a/src/ephy-session.c +++ b/src/ephy-session.c @@ -32,11 +32,11 @@ #include "ephy-embed-container.h" #include "ephy-extension.h" #include "ephy-file-helpers.h" -#include "eel-gconf-extensions.h" #include "ephy-gui.h" #include "ephy-history-window.h" #include "ephy-notebook.h" #include "ephy-prefs.h" +#include "ephy-settings.h" #include "ephy-shell.h" #include "ephy-stock-icons.h" #include "ephy-window.h" @@ -1667,14 +1667,18 @@ ephy_session_load (EphySession *session, if (id && xmlStrEqual ((const xmlChar *) BOOKMARKS_EDITOR_ID, id)) { - if (!eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_BOOKMARK_EDITING)) + if (!g_settings_get_boolean + (EPHY_SETTINGS_LOCKDOWN, + EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING)) { widget = ephy_shell_get_bookmarks_editor (ephy_shell); } } else if (id && xmlStrEqual ((const xmlChar *) HISTORY_WINDOW_ID, id)) { - if (!eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_HISTORY)) + if (!g_settings_get_boolean + (EPHY_SETTINGS_LOCKDOWN, + EPHY_PREFS_LOCKDOWN_HISTORY)) { widget = ephy_shell_get_history_window (ephy_shell); } |