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.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 'embed/ephy-embed.c')
| -rw-r--r-- | embed/ephy-embed.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index 0f6b01198..77066d393 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -26,7 +26,6 @@ #include "config.h" #include "downloader-view.h" -#include "eel-gconf-extensions.h" #include "ephy-adblock-manager.h" #include "ephy-debug.h" #include "ephy-embed.h" @@ -40,6 +39,7 @@ #include "ephy-file-helpers.h" #include "ephy-history.h" #include "ephy-prefs.h" +#include "ephy-settings.h" #include "ephy-stock-icons.h" #include "ephy-string.h" #include "ephy-web-view.h" @@ -445,7 +445,7 @@ request_destination_uri (WebKitWebView *web_view, dialog = ephy_file_chooser_new (_("Save"), window, GTK_FILE_CHOOSER_ACTION_SAVE, - CONF_STATE_SAVE_DIR, + EPHY_PREFS_STATE_SAVE_DIR, EPHY_FILE_FILTER_ALL_SUPPORTED); gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), suggested_filename); @@ -823,7 +823,8 @@ download_status_changed_cb (GObject *object, */ g_object_freeze_notify (G_OBJECT (download)); - if (eel_gconf_get_boolean (CONF_AUTO_DOWNLOADS)) { + if (g_settings_get_boolean (EPHY_SETTINGS_MAIN, + EPHY_PREFS_AUTO_DOWNLOADS)) { perform_auto_download (download); /* User won't select a destination, unfreeze. */ g_object_thaw_notify (G_OBJECT (download)); @@ -857,7 +858,8 @@ download_requested_cb (WebKitWebView *web_view, EphyEmbed *embed) { /* Is download locked down? */ - if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_SAVE_TO_DISK)) + if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN, + EPHY_PREFS_LOCKDOWN_SAVE_TO_DISK)) return FALSE; /* Wait for the request to be sent in all cases, so that we have a |