diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2010-05-22 08:34:12 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2010-05-22 08:38:05 (GMT) |
| commit | c71cb3c049f191734d90cd144cd5ec8920c02abe (patch) | |
| tree | 152d9ef2368814d0cd9a8f1f7862d95eaac18cfd /shell | |
| parent | 985f7016929bae86f89e63fc2b7b56145fbd0382 (diff) | |
[shell] Do not use the gconf gsettings backend any more
- rename keys to follow gsettings name restrictions (s/_/-/)
- remove the hardcoding of the gconf backend
- use new gsettings macros as they have changed in glib 2.25.6
Based on patch by Matthias Clasen, see bug #619335.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ev-window.c | 3 | ||||
| -rw-r--r-- | shell/main.c | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/shell/ev-window.c b/shell/ev-window.c index dbdb63b..b4e8739 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -223,13 +223,12 @@ struct _EvWindowPrivate { #define NAVIGATION_ACTION "Navigation" #define GCONF_LOCKDOWN_DIR "/desktop/gnome/lockdown" -#define GCONF_OVERRIDE_RESTRICTIONS "/apps/evince/override_restrictions" #define GCONF_LOCKDOWN_SAVE "/desktop/gnome/lockdown/disable_save_to_disk" #define GCONF_LOCKDOWN_PRINT "/desktop/gnome/lockdown/disable_printing" #define GCONF_LOCKDOWN_PRINT_SETUP "/desktop/gnome/lockdown/disable_print_setup" #define GS_SCHEMA_NAME "org.gnome.Evince" -#define GS_OVERRIDE_RESTRICTIONS "override_restrictions" +#define GS_OVERRIDE_RESTRICTIONS "override-restrictions" #define SIDEBAR_DEFAULT_SIZE 132 #define LINKS_SIDEBAR_ID "links" diff --git a/shell/main.c b/shell/main.c index 187a794..e8bc6ca 100644 --- a/shell/main.c +++ b/shell/main.c @@ -238,11 +238,6 @@ main (int argc, char *argv[]) GOptionContext *context; GError *error = NULL; -#ifdef WITH_GCONF - /* Remove when porting is done */ - g_setenv ("GSETTINGS_BACKEND", "gconf", FALSE); -#endif - #ifdef G_OS_WIN32 if (fileno (stdout) != -1 && |