[gnome-settings-daemon: 6/6] Merge branch 'randr-set-as-default'

[Federico Mena Quintero <federico src gnome org>]

commit 20cbbc00e62832de3f7b43f2729a6e8968cdd5b0
Merge: d5fc6ca f283ad8
Author: Federico Mena Quintero <federico novell com>
Date:   Tue Apr 6 18:28:45 2010 -0500

    Merge branch 'randr-set-as-default'
    
    This adds the logic needed for the "Make Default" button in gnome-display-properties.
    When the user does not have a ~/.config/monitors.xml at login time, the RANDR
    plug-in for gnome-settings-daemon will now look in
    
      /etc/gnome-settings-daemon/xrandr/monitors.xml
    
    for a default configuration.  The system administrator can set up that file
    with a suitable multi-monitor configuration.  Users can subsequently change
    their own configuration with their own ~/.config/monitors.xml as usual.

 data/apps_gnome_settings_daemon_xrandr.schemas.in |   44 +++++++++++++
 plugins/xrandr/Makefile.am                        |    1 +
 plugins/xrandr/gsd-xrandr-manager.c               |   71 +++++++++++++++++++--
 3 files changed, 109 insertions(+), 7 deletions(-)
---