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-shell.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-shell.c')
| -rw-r--r-- | src/ephy-shell.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 2d575d092..f15ceda6a 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -30,10 +30,8 @@ #include "ephy-shell.h" #include "ephy-type-builtins.h" #include "ephy-embed-container.h" -#include "ephy-embed-shell.h" #include "ephy-embed-single.h" #include "ephy-embed-utils.h" -#include "eel-gconf-extensions.h" #include "ephy-prefs.h" #include "ephy-file-helpers.h" #include "ephy-favicon-cache.h" @@ -54,6 +52,7 @@ #include "egg-toolbars-model.h" #include "ephy-toolbars-model.h" #include "ephy-toolbar.h" +#include "ephy-settings.h" #include "ephy-prefs.h" #include "ephy-gui.h" #include "ephy-stock-icons.h" @@ -124,7 +123,8 @@ ephy_shell_new_window_cb (EphyEmbedSingle *single, LOG ("ephy_shell_new_window_cb tab chrome %d", chromemask); - if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_JAVASCRIPT_CHROME)) + if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN, + EPHY_PREFS_LOCKDOWN_JAVASCRIPT_CHROME)) { chromemask = EPHY_WEB_VIEW_CHROME_ALL; } @@ -368,7 +368,10 @@ ephy_shell_new_tab_full (EphyShell *shell, if (flags & EPHY_NEW_TAB_IN_EXISTING_WINDOW) in_new_window = FALSE; if (flags & EPHY_NEW_TAB_DONT_COPY_HISTORY) copy_history = FALSE; - in_new_window = in_new_window && !eel_gconf_get_boolean (CONF_LOCKDOWN_FULLSCREEN); + in_new_window = in_new_window && + !g_settings_get_boolean + (EPHY_SETTINGS_LOCKDOWN, + EPHY_PREFS_LOCKDOWN_FULLSCREEN); g_return_val_if_fail (open_page == (gboolean)(request != NULL), NULL); jump_to = (flags & EPHY_NEW_TAB_JUMP) != 0; |