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-main.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-main.c')
| -rw-r--r-- | src/ephy-main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c index dd7b69f55..1f0692884 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -20,13 +20,13 @@ #include "config.h" +#include "ephy-settings.h" #include "ephy-shell.h" #include "ephy-file-helpers.h" #include "ephy-object-helpers.h" #include "ephy-state.h" #include "ephy-debug.h" #include "ephy-stock-icons.h" -#include "eel-gconf-extensions.h" #include "ephy-dbus-client-bindings.h" #include "ephy-activation.h" #include "ephy-session.h" @@ -438,6 +438,7 @@ main (int argc, DBusGProxy *proxy; GError *error = NULL; guint32 user_time; + gboolean arbitrary_url; #ifdef ENABLE_NLS /* Initialize the i18n stuff */ @@ -572,8 +573,10 @@ main (int argc, exit (1); } - if (arguments != NULL && - eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_ARBITRARY_URL)) + arbitrary_url = g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN, + EPHY_PREFS_LOCKDOWN_ARBITRARY_URL); + + if (arguments != NULL && arbitrary_url) { g_print ("URL loading is locked down\n"); exit (1); @@ -718,7 +721,6 @@ main (int argc, if (ephy_has_private_profile () == FALSE) _ephy_profile_migrate (); - eel_gconf_monitor_add ("/apps/epiphany/general"); ephy_stock_icons_init (); load_accels (); @@ -745,9 +747,9 @@ main (int argc, if (notify_is_initted ()) notify_uninit (); #endif - eel_gconf_monitor_remove ("/apps/epiphany/general"); save_accels (); ephy_state_save (); + ephy_settings_shutdown (); ephy_file_helpers_shutdown (); xmlCleanupParser (); |