[gnome-color-manager/colord: 2/6] Remove UDev support, it's being done in colord now



commit c2eadbd6fd517c0ec9a15ca574fe6dc622cff3c6
Author: Richard Hughes <richard hughsie com>
Date:   Sat Jan 15 12:09:53 2011 +0000

    Remove UDev support, it's being done in colord now

 src/Makefile.am       |    2 -
 src/gcm-client.c      |   13 ---
 src/gcm-device-udev.c |  237 -------------------------------------------------
 src/gcm-device-udev.h |   60 -------------
 4 files changed, 0 insertions(+), 312 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 463b718..61df26f 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-udev.c				\
-	gcm-device-udev.h				\
 	gcm-device-virtual.c				\
 	gcm-device-virtual.h				\
 	gcm-cie-widget.c				\
diff --git a/src/gcm-client.c b/src/gcm-client.c
index 5731381..43eb307 100644
--- a/src/gcm-client.c
+++ b/src/gcm-client.c
@@ -40,7 +40,6 @@
 #include "gcm-x11-screen.h"
 #include "gcm-client.h"
 #include "gcm-device-xrandr.h"
-#include "gcm-device-udev.h"
 #ifdef HAVE_SANE
  #include "gcm-device-sane.h"
 #endif
@@ -354,15 +353,6 @@ gcm_client_gudev_add (GcmClient *client, GUdevDevice *udev_device)
 	if (value == NULL)
 		goto out;
 
-	/* create new device */
-	device = gcm_device_udev_new ();
-	ret = gcm_device_udev_set_from_device (device, udev_device, &error);
-	if (!ret) {
-		g_debug ("failed to set for device: %s", error->message);
-		g_error_free (error);
-		goto out;
-	}
-
 	/* add device */
 	ret = gcm_client_add_device (client, device, &error);
 	if (!ret) {
@@ -852,9 +842,6 @@ gcm_client_add_unconnected_device (GcmClient *client, GKeyFile *keyfile, const g
 		device = gcm_device_virtual_new ();
 	} else if (kind == GCM_DEVICE_KIND_DISPLAY) {
 		device = gcm_device_xrandr_new ();
-	} else if (kind == GCM_DEVICE_KIND_CAMERA) {
-		/* FIXME: use GPhoto? */
-		device = gcm_device_udev_new ();
 #ifdef HAVE_SANE
 	} else if (kind == GCM_DEVICE_KIND_SCANNER) {
 		device = gcm_device_sane_new ();



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]