[gedit] Use the desktop settings instead of adding them ourselves.

[Ignacio Casal Quinteiro <icq src gnome org>]

commit cca22bb94dc9649ef3aa5adb6b27c92c049e7272
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Jul 25 19:13:44 2010 +0200

    Use the desktop settings instead of adding them ourselves.

 configure.ac                                       |    1 +
 data/org.gnome.gedit.gschema.xml.in.in             |   19 -------------------
 gedit/gedit-settings.c                             |    6 +++---
 plugins/filebrowser/gedit-file-browser-plugin.c    |    2 +-
 ...ome.gedit.plugins.filebrowser.gschema.xml.in.in |    5 -----
 5 files changed, 5 insertions(+), 28 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ac2aa65..f9a3792 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,6 +275,7 @@ PKG_CHECK_MODULES(GEDIT, [
 	gtksourceview-3.0 >= 2.11.2
 	libpeas-1.0 >= 0.5.2
 	libpeasui-1.0 >= 0.5.2
+	gsettings-desktop-schemas
 ])
 
 if test "$os_osx" = "no" &&
diff --git a/data/org.gnome.gedit.gschema.xml.in.in b/data/org.gnome.gedit.gschema.xml.in.in
index 8d8b8c8..89e996d 100644
--- a/data/org.gnome.gedit.gschema.xml.in.in
+++ b/data/org.gnome.gedit.gschema.xml.in.in
@@ -265,23 +265,4 @@
       <_description>List of active plugins. It contains the "Location" of the active plugins. See the .gedit-plugin file for obtaining the "Location" of a given plugin.</_description>
     </key>
   </schema>
-  <schema id="org.gnome.Desktop.Lockdown" path="/desktop/gnome/lockdown/">
-    <key name="disable-command-line" type="b">
-      <default>false</default>
-    </key>
-    <key name="disable-printing" type="b">
-      <default>false</default>
-    </key>
-    <key name="disable-print-setup" type="b">
-      <default>false</default>
-    </key>
-    <key name="disable-save-to-disk" type="b">
-      <default>false</default>
-    </key>
-  </schema>
-  <schema id="org.gnome.Desktop.Interface" path="/desktop/gnome/interface/">
-    <key name="monospace-font-name" type="s">
-      <default>'Monospace 10'</default>
-    </key>
-  </schema>
 </schemalist>
diff --git a/gedit/gedit-settings.c b/gedit/gedit-settings.c
index 60a8a13..dbac7da 100644
--- a/gedit/gedit-settings.c
+++ b/gedit/gedit-settings.c
@@ -668,17 +668,17 @@ initialize (GeditSettings *gs)
 	gs->priv->plugins = g_settings_get_child (G_SETTINGS (gs), "plugins");
 	
 	/* Load settings */
-	gs->priv->lockdown = g_settings_new ("org.gnome.Desktop.Lockdown");
+	gs->priv->lockdown = g_settings_new ("org.gnome.desktop.lockdown");
 	
 	g_signal_connect (gs->priv->lockdown,
 			  "changed",
 			  G_CALLBACK (on_lockdown_changed),
 			  NULL);
 
-	gs->priv->interface = g_settings_new ("org.gnome.Desktop.Interface");
+	gs->priv->interface = g_settings_new ("org.gnome.desktop.interface");
 	
 	g_signal_connect (gs->priv->interface,
-			  "changed",
+			  "changed::monospace-font-name",
 			  G_CALLBACK (on_system_font_changed),
 			  gs);
 
diff --git a/plugins/filebrowser/gedit-file-browser-plugin.c b/plugins/filebrowser/gedit-file-browser-plugin.c
index 097b907..75d5b54 100644
--- a/plugins/filebrowser/gedit-file-browser-plugin.c
+++ b/plugins/filebrowser/gedit-file-browser-plugin.c
@@ -54,7 +54,7 @@
 #define NAUTILUS_ENABLE_DELETE_KEY	"enable-delete"
 #define NAUTILUS_CONFIRM_TRASH_KEY	"confirm-trash"
 
-#define TERMINAL_BASE_SETTINGS		"org.gnome.Desktop.Applications.Terminal"
+#define TERMINAL_BASE_SETTINGS		"org.gnome.desktop.default-applications.terminal"
 #define TERMINAL_EXEC_KEY		"exec"
 
 #define GEDIT_FILE_BROWSER_PLUGIN_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ((object), GEDIT_TYPE_FILE_BROWSER_PLUGIN, GeditFileBrowserPluginPrivate))
diff --git a/plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in.in b/plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in.in
index 5ba9994..14af945 100644
--- a/plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in.in
+++ b/plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in.in
@@ -36,11 +36,6 @@
       <_description>The filter pattern to filter the file browser with. This filter works on top of the filter_mode.</_description>
     </key>
   </schema>
-  <schema id="org.gnome.Desktop.Applications.Terminal" path="/desktop/gnome/applications/terminal/">
-    <key name="exec" type="s">
-      <default>'gnome-terminal'</default>
-    </key>
-  </schema>
   <schema id="org.gnome.Nautilus.preferences" path="/apps/nautilus/preferences/">
     <key name="click-policy" type="s">
       <default>'double'</default>