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-toolbar-editor.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 'src/ephy-toolbar-editor.c')
-rw-r--r-- | src/ephy-toolbar-editor.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/ephy-toolbar-editor.c b/src/ephy-toolbar-editor.c index 4476e1fbe..2fd49250f 100644 --- a/src/ephy-toolbar-editor.c +++ b/src/ephy-toolbar-editor.c @@ -20,19 +20,19 @@ #include "config.h" -#include "ephy-toolbar-editor.h" +#include "ephy-debug.h" #include "ephy-gui.h" #include "ephy-prefs.h" +#include "ephy-settings.h" #include "ephy-state.h" #include "ephy-file-helpers.h" #include "ephy-shell.h" +#include "ephy-stock-icons.h" +#include "ephy-toolbar-editor.h" #include "eggtypebuiltins.h" #include "egg-toolbars-model.h" #include "egg-editable-toolbar.h" #include "egg-toolbar-editor.h" -#include "eel-gconf-extensions.h" -#include "ephy-stock-icons.h" -#include "ephy-debug.h" #include <glib/gi18n.h> #include <gtk/gtk.h> @@ -115,7 +115,8 @@ combo_changed_cb (GtkComboBox *combo, pref = value->value_nick; } - eel_gconf_set_string (CONF_INTERFACE_TOOLBAR_STYLE, pref); + g_settings_set_string (EPHY_SETTINGS_UI, + EPHY_PREFS_UI_TOOLBAR_STYLE, pref); g_type_class_unref (flags_class); } @@ -240,7 +241,8 @@ ephy_toolbar_editor_constructor (GType type, gtk_widget_show_all (hbox); /* get active from pref */ - pref = eel_gconf_get_string (CONF_INTERFACE_TOOLBAR_STYLE); + pref = g_settings_get_string (EPHY_SETTINGS_UI, + EPHY_PREFS_UI_TOOLBAR_STYLE); if (pref != NULL) { flags_class = g_type_class_ref (EGG_TYPE_TB_MODEL_FLAGS); |