[gnome-color-manager/colord: 5/6] Remove virtual profile devices, they are now saved in colord

[Richard Hughes <rhughes src gnome org>]

commit 881f3ee903b7a11cd9eda5e8c7aca3cf45905119
Author: Richard Hughes <richard hughsie com>
Date:   Sat Jan 15 13:53:37 2011 +0000

    Remove virtual profile devices, they are now saved in colord

 src/Makefile.am          |    2 -
 src/cc-color-panel.c     |   15 ++-----
 src/gcm-client.c         |    5 +--
 src/gcm-device-virtual.c |   99 ----------------------------------------------
 src/gcm-device-virtual.h |   61 ----------------------------
 5 files changed, 5 insertions(+), 177 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index db0d648..7fd1261 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,8 +52,6 @@ libgcmshared_a_SOURCES =				\
 	gcm-device.h					\
 	gcm-device-xrandr.c				\
 	gcm-device-xrandr.h				\
-	gcm-device-virtual.c				\
-	gcm-device-virtual.h				\
 	gcm-cie-widget.c				\
 	gcm-cie-widget.h				\
 	gcm-trc-widget.c				\
diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
index e9d1a26..17e172c 100644
--- a/src/cc-color-panel.c
+++ b/src/cc-color-panel.c
@@ -36,7 +36,6 @@
 #include "gcm-client.h"
 #include "gcm-sensor-client.h"
 #include "gcm-device-xrandr.h"
-#include "gcm-device-virtual.h"
 #include "gcm-exif.h"
 #include "gcm-profile.h"
 #include "gcm-profile-store.h"
@@ -461,7 +460,8 @@ cc_color_panel_profile_add_virtual_file (CcColorPanel *panel, GFile *file)
 	}
 
 	/* create device */
-	device = gcm_device_virtual_new	();
+	device = NULL;
+#if 0
 	ret = gcm_device_virtual_create_from_params (GCM_DEVICE_VIRTUAL (device),
 						     gcm_exif_get_device_kind (exif),
 						     gcm_exif_get_model (exif),
@@ -473,6 +473,7 @@ cc_color_panel_profile_add_virtual_file (CcColorPanel *panel, GFile *file)
 		cc_color_panel_error_dialog (panel, _("Failed to create virtual device"), NULL);
 		goto out;
 	}
+#endif
 
 	/* save what we've got */
 	ret = gcm_device_save (device, &error);
@@ -1086,15 +1087,7 @@ cc_color_panel_button_virtual_add_cb (GtkWidget *widget, CcColorPanel *panel)
 	manufacturer = gtk_entry_get_text (GTK_ENTRY (widget));
 
 	/* create device */
-	device = gcm_device_virtual_new	();
-	ret = gcm_device_virtual_create_from_params (GCM_DEVICE_VIRTUAL (device),
-						     device_kind, model, manufacturer,
-						     NULL, GCM_COLORSPACE_RGB);
-	if (!ret) {
-		/* TRANSLATORS: could not add virtual device */
-		cc_color_panel_error_dialog (panel, _("Failed to create virtual device"), NULL);
-		goto out;
-	}
+	device = NULL;
 
 	/* save what we've got */
 	ret = gcm_device_save (device, &error);
diff --git a/src/gcm-client.c b/src/gcm-client.c
index 43eb307..4925973 100644
--- a/src/gcm-client.c
+++ b/src/gcm-client.c
@@ -43,7 +43,6 @@
 #ifdef HAVE_SANE
  #include "gcm-device-sane.h"
 #endif
-#include "gcm-device-virtual.h"
 #include "gcm-x11-screen.h"
 #include "gcm-utils.h"
 
@@ -838,9 +837,7 @@ gcm_client_add_unconnected_device (GcmClient *client, GKeyFile *keyfile, const g
 	}
 
 	/* create device of specified type */
-	if (virtual) {
-		device = gcm_device_virtual_new ();
-	} else if (kind == GCM_DEVICE_KIND_DISPLAY) {
+	if (kind == GCM_DEVICE_KIND_DISPLAY) {
 		device = gcm_device_xrandr_new ();
 #ifdef HAVE_SANE
 	} else if (kind == GCM_DEVICE_KIND_SCANNER) {