[gnome-desktop: 6/6] Merge branch 'randr-connector-type'

[Federico Mena Quintero <federico src gnome org>]

commit 60f318f3d5a890c267160562f54a048d862def18
Merge: 4886011 019e6a7
Author: Federico Mena Quintero <federico novell com>
Date:   Mon Feb 22 18:00:13 2010 -0600

    Merge branch 'randr-connector-type'
    
    This adds two new APIs:
    
    gnome_rr_output_get_connector_type()
    gnome_rr_output_is_laptop()
    
    These will be used by gnome-settings-daemon/plugins/xrandr and
    gnome-control-center/capplets/display.

 libgnome-desktop/display-name.c        |   12 +----
 libgnome-desktop/edid.h                |    3 +-
 libgnome-desktop/gnome-rr-config.c     |    8 ++-
 libgnome-desktop/gnome-rr-private.h    |    2 +
 libgnome-desktop/gnome-rr.c            |   83 +++++++++++++++++++++++++++++++-
 libgnome-desktop/libgnomeui/gnome-rr.h |    4 ++
 6 files changed, 96 insertions(+), 16 deletions(-)
---