[gnome-settings-daemon] Fix XRandR schema validation

[Bastien Nocera <hadess src gnome org>]

commit beb33c99681f0acd8328e39f291bfe33c668b6d5
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Oct 8 15:46:25 2010 +0100

    Fix XRandR schema validation

 ...ettings-daemon.plugins.xrandr.gschema.xml.in.in |    6 +++---
 plugins/xrandr/gsd-xrandr-manager.c                |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
index a769d1b..c32c72b 100644
--- a/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
@@ -1,7 +1,7 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.xrandr" path="/apps/gnome-settings-daemon/plugins/xrandr/">
     <key name="default-configuration-file" type="s">
-      <default>/etc/gnome-settings-daemon/xrandr/monitors.xml</default>
+      <default>'/etc/gnome-settings-daemon/xrandr/monitors.xml'</default>
       <_summary>File for default configuration for RandR</_summary>
       <_description>The XRandR plugin will look for a default configuration in the file specified by this key. This is similar to the ~/.config/monitors.xml that normally gets stored in users' home directories.  If a user does not have such a file, or has one that does not match the user's setup of monitors, then the file specified by this key will be used instead.</_description>
     </key>
@@ -10,12 +10,12 @@
       <_summary>Show display in Notification Area</_summary>
       <_description>Whether a notification icon with display-related things should be shown in the panel.</_description>
     </key>
-    <key name="turn-on-external-monitors-at-startup" type="b">
+    <key name="turn-on-external-monitors" type="b">
       <default>false</default>
       <_summary>Turn on external monitor after system boot</_summary>
       <_description>Turn on external monitor after system boot if user plugs in external monitor on system boot.</_description>
     </key>
-    <key name="turn-on-laptop-monitor-at-startup" type="b">
+    <key name="turn-on-laptop-monitor" type="b">
       <default>true</default>
       <_summary>Turn on laptop monitor after system boot</_summary>
       <_description>Turn on laptop monitor after system boot if user plugs in external monitor on system boot.</_description>
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index e900452..02536a3 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -61,8 +61,8 @@
 
 #define CONF_DIR "org.gnome.settings-daemon.plugins.xrandr"
 #define CONF_KEY_SHOW_NOTIFICATION_ICON ("show-notification-icon")
-#define CONF_KEY_TURN_ON_EXTERNAL_MONITORS_AT_STARTUP	("turn-on-external-monitors-at-startup")
-#define CONF_KEY_TURN_ON_LAPTOP_MONITOR_AT_STARTUP	("turn-on-laptop-monitor-at-startup")
+#define CONF_KEY_TURN_ON_EXTERNAL_MONITORS_AT_STARTUP	("turn-on-external-monitors")
+#define CONF_KEY_TURN_ON_LAPTOP_MONITOR_AT_STARTUP	("turn-on-laptop-monitor")
 #define CONF_KEY_DEFAULT_CONFIGURATION_FILE             ("default-configuration-file")
 
 #define VIDEO_KEYSYM    "XF86Display"