Port preferences to GSettings

Move preferences to GSettings, using mainly shared schemas from
gsettings-desktop-schemas.

Unlike GConf, GSettings support is not optional, as Gio is already
a hard dependency of GTK+.

Based on an initial patch from Milan Bouchet-Valat.

https://bugzilla.gnome.org/show_bug.cgi?id=621204

4 files changed, 9 insertions, 9 deletions

diff --git a/doc/compositor-control.txt b/doc/compositor-control.txt
index e2e04bd7..ae0f5987 100644
--- a/doc/compositor-control.txt
+++ b/doc/compositor-control.txt
@@ -7,14 +7,14 @@ To turn the compositor on initially, you need to pass --enable-compositor to
 the configure script. This will introduce a dependence on libcm, which you
 can get from <URL:http://ftp.gnome.org/pub/GNOME/sources/libcm/>.
 
-When Metacity is compiled, you will need to turn the compositor on in gconf
+When Metacity is compiled, you will need to turn the compositor on in gsettings
 for it to have any effect. You will find the boolean switch at
 
-   /apps/metacity/general/compositing_manager
+   org.gnome.metacity compositing-manager
 
 When that's done, you can set some environment variables before you launch
 Metacity to influence how the compositor works. These will eventually become
-configuration options or gconf options when they grow up. Define them to any
+configuration options or gsettings options when they grow up. Define them to any
 value to turn them on; leave them undefined to turn them off. Currently the
 options you can set are:
 
diff --git a/doc/creating_themes/C/creating-metacity-themes.xml b/doc/creating_themes/C/creating-metacity-themes.xml
index ea5f040e..045cae28 100644
--- a/doc/creating_themes/C/creating-metacity-themes.xml
+++ b/doc/creating_themes/C/creating-metacity-themes.xml
@@ -266,9 +266,9 @@ for a theme installed for all users.</para></listitem>
 <para>When you're editing a theme, you can view it without using it on the whole desktop using
 <command>metacity-theme-viewer YourThemeName</command></para>
 <para>and view it on the whole desktop using
-<command>gconftool -<!-- x -->-type=string -<!-- x -->-set /apps/metacity/general/theme YourThemeName</command></para>
+<command>gsettings set org.gnome.desktop.wm.preferences theme YourThemeName</command></para>
 
-<para>Whenever you change the selected theme in GConf, Metacity will load the newly-chosen theme.  This is how control-center does it.  But when you change a theme, as you're working on it, you might want to ask Metacity to reload the theme which is currently used on the whole desktop to reflect your changes.  You can do this using the little-known <command>metacity-message</command> program, with the command <literal>metacity-message reload-theme</literal>.  This works by sending the ClientMessage <literal>_METACITY_RELOAD_THEME_MESSAGE</literal> to the root window, in case you're interested.</para>
+<para>Whenever you change the selected theme in GSettings, Metacity will load the newly-chosen theme.  This is how control-center does it.  But when you change a theme, as you're working on it, you might want to ask Metacity to reload the theme which is currently used on the whole desktop to reflect your changes.  You can do this using the little-known <command>metacity-message</command> program, with the command <literal>metacity-message reload-theme</literal>.  This works by sending the ClientMessage <literal>_METACITY_RELOAD_THEME_MESSAGE</literal> to the root window, in case you're interested.</para>
 
 <para>Once you're done with your theme, consider submitting it to <ulink url="http://art.gnome.org/themes/metacity/">the art.gnome.org site</ulink>, or <ulink url="http://www.gnome-look.org/index.php?xcontentmode=101">the gnome-look site</ulink>.</para>
 
diff --git a/doc/man/metacity-message.1 b/doc/man/metacity-message.1
index 7ee62cd7..80041f57 100644
--- a/doc/man/metacity-message.1
+++ b/doc/man/metacity-message.1
@@ -46,13 +46,13 @@ because the original program does not have a manual page.
 Restart \fBmetacity\fP(1) which is running.
 .TP
 .B reload-theme
-Reload a theme which is specified on gconf database.
+Reload a theme which is specified on gsettings database.
 .TP
 .B enable-keybindings
-Enable all of keybindings which is specified on gconf database.
+Enable all of keybindings which is specified on gsettings database.
 .TP
 .B disable-keybindings
-Disable all of keybindings which is specified on gconf database.
+Disable all of keybindings which is specified on gsettings database.
 .SH SEE ALSO
 .BR metacity (1)
 .SH AUTHOR
diff --git a/doc/man/metacity.1 b/doc/man/metacity.1
index 3232ade0..0a4c3470 100644
--- a/doc/man/metacity.1
+++ b/doc/man/metacity.1
@@ -51,7 +51,7 @@ Print the version number.
 .B \-?, \-\-help
 Show summary of options.
 .SH CONFIGURATION
-\fBmetacity\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gconf editing (gconf-editor or gconftool-2).
+\fBmetacity\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gsettings.
 .SH SEE ALSO
 .BR metacity-message (1)
 .SH AUTHOR