[gnome-color-manager] trivial: fix display calibration by using the new metadata feature in colord

[Richard Hughes <rhughes src gnome org>]

commit 8aa82e7c03dc49162cca1b823b5259523e6634b9
Author: Richard Hughes <richard hughsie com>
Date:   Thu Mar 31 11:35:59 2011 +0100

    trivial: fix display calibration by using the new metadata feature in colord

 src/gcm-calibrate-argyll.c |    1 +
 src/gcm-calibrate.c        |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/gcm-calibrate-argyll.c b/src/gcm-calibrate-argyll.c
index ac21007..dbc8093 100644
--- a/src/gcm-calibrate-argyll.c
+++ b/src/gcm-calibrate-argyll.c
@@ -2875,6 +2875,7 @@ gcm_calibrate_argyll_init (GcmCalibrateArgyll *calibrate_argyll)
 
 	/* get screen */
 	calibrate_argyll->priv->screen = gcm_x11_screen_new ();
+	gcm_x11_screen_assign (calibrate_argyll->priv->screen, NULL, NULL);
 
 	/* add vte widget */
 #ifdef HAVE_VTE
diff --git a/src/gcm-calibrate.c b/src/gcm-calibrate.c
index 165eacf..71f8ab5 100644
--- a/src/gcm-calibrate.c
+++ b/src/gcm-calibrate.c
@@ -333,7 +333,9 @@ gcm_calibrate_set_from_device (GcmCalibrate *calibrate, CdDevice *device, GError
 
 	/* display specific properties */
 	if (kind == CD_DEVICE_KIND_DISPLAY) {
-//		native_device = cd_device_xrandr_get_native_device (CD_DEVICE_XRANDR (device));
+#if CD_CHECK_VERSION(0,1,5)
+		native_device = cd_device_get_metadata_item (device, "XRANDR_name");
+#endif
 		if (native_device == NULL) {
 			g_set_error (error,
 				     GCM_CALIBRATE_ERROR,