[gnome-color-manager/colord: 3/6] Remove the DDC support from gnome-color-manager, it belongs in a lower library

[Richard Hughes <rhughes src gnome org>]

commit 193a2d682647fd27a05c0c285c31efb493e26c3d
Author: Richard Hughes <richard hughsie com>
Date:   Sat Jan 15 12:17:54 2011 +0000

    Remove the DDC support from gnome-color-manager, it belongs in a lower library

 libcolor-glib/Makefile.am       |   12 -
 libcolor-glib/gcm-ddc-client.c  |  374 -------------
 libcolor-glib/gcm-ddc-client.h  |   99 ----
 libcolor-glib/gcm-ddc-common.c  |  175 ------
 libcolor-glib/gcm-ddc-common.h  |   59 --
 libcolor-glib/gcm-ddc-control.c |  519 ------------------
 libcolor-glib/gcm-ddc-control.h |  116 ----
 libcolor-glib/gcm-ddc-device.c  | 1158 ---------------------------------------
 libcolor-glib/gcm-ddc-device.h  |  137 -----
 libcolor-glib/gcm-self-test.c   |   42 --
 libcolor-glib/libcolor-glib.h   |    4 -
 rules/.gitignore                |    1 -
 rules/55-gcm-i2c.rules          |   18 -
 rules/Makefile.am               |   28 +-
 rules/gcm-udev-ddc.c            |   72 ---
 tools/Makefile.am               |   10 -
 tools/gcm-ddc-util.c            |  312 -----------
 17 files changed, 1 insertions(+), 3135 deletions(-)
---
diff --git a/libcolor-glib/Makefile.am b/libcolor-glib/Makefile.am
index 22e7deb..752d0fb 100644
--- a/libcolor-glib/Makefile.am
+++ b/libcolor-glib/Makefile.am
@@ -37,10 +37,6 @@ libcolor_glib_include_HEADERS =					\
 	gcm-math.h						\
 	gcm-compat.h						\
 	gcm-color.h						\
-	gcm-ddc-client.h					\
-	gcm-ddc-device.h					\
-	gcm-ddc-control.h					\
-	gcm-ddc-common.h					\
 	gcm-sensor-huey.h					\
 	gcm-sensor.h						\
 	gcm-edid.h						\
@@ -91,14 +87,6 @@ libcolor_glib_la_SOURCES =					\
 	gcm-clut.h						\
 	gcm-image.c						\
 	gcm-image.h						\
-	gcm-ddc-client.c					\
-	gcm-ddc-client.h					\
-	gcm-ddc-device.c					\
-	gcm-ddc-device.h					\
-	gcm-ddc-control.c					\
-	gcm-ddc-control.h					\
-	gcm-ddc-common.c					\
-	gcm-ddc-common.h					\
 	gcm-enum.c						\
 	gcm-enum.h						\
 	gcm-usb.c						\
diff --git a/libcolor-glib/gcm-self-test.c b/libcolor-glib/gcm-self-test.c
index 5f8044a..19113e1 100644
--- a/libcolor-glib/gcm-self-test.c
+++ b/libcolor-glib/gcm-self-test.c
@@ -29,8 +29,6 @@
 #include "gcm-color.h"
 #include "gcm-clut.h"
 #include "gcm-math.h"
-#include "gcm-ddc-client.h"
-#include "gcm-ddc-device.h"
 #include "gcm-dmi.h"
 #include "gcm-edid.h"
 #include "gcm-image.h"
@@ -130,44 +128,6 @@ gcm_test_math_func (void)
 }
 
 static void
-gcm_test_ddc_device_func (void)
-{
-	GcmDdcDevice *device;
-
-	device = gcm_ddc_device_new ();
-	g_assert (device != NULL);
-
-	g_object_unref (device);
-}
-
-static void
-gcm_test_ddc_client_func (void)
-{
-	gboolean ret;
-	GPtrArray *array;
-	GError *error = NULL;
-	GcmDdcClient *client;
-
-	client = gcm_ddc_client_new ();
-	g_assert (client != NULL);
-	gcm_ddc_client_set_verbose (client, GCM_VERBOSE_OVERVIEW);
-
-	array = gcm_ddc_client_get_devices (client, &error);
-	g_assert_no_error (error);
-	g_assert (array != NULL);
-
-	/* ensure we have at least one usable device */
-	g_assert_cmpint (array->len, >, 0);
-	g_ptr_array_unref (array);
-
-	ret = gcm_ddc_client_close (client, &error);
-	g_assert_no_error (error);
-	g_assert (ret);
-
-	g_object_unref (client);
-}
-
-static void
 gcm_test_sensor_button_pressed_cb (GcmSensor *sensor, gint *signal_count)
 {
 	(*signal_count)++;
@@ -866,8 +826,6 @@ main (int argc, char **argv)
 
 	/* tests go here */
 	g_test_add_func ("/libcolor-glib/math", gcm_test_math_func);
-	g_test_add_func ("/libcolor-glib/ddc-device", gcm_test_ddc_device_func);
-	g_test_add_func ("/libcolor-glib/ddc-client", gcm_test_ddc_client_func);
 	g_test_add_func ("/libcolor-glib/sensor", gcm_test_sensor_func);
 	g_test_add_func ("/libcolor-glib/edid", gcm_test_edid_func);
 	g_test_add_func ("/libcolor-glib/tables", gcm_test_tables_func);
diff --git a/libcolor-glib/libcolor-glib.h b/libcolor-glib/libcolor-glib.h
index 7ca93cb..401f2eb 100644
--- a/libcolor-glib/libcolor-glib.h
+++ b/libcolor-glib/libcolor-glib.h
@@ -32,10 +32,6 @@
 #include <gcm-math.h>
 #include <gcm-compat.h>
 #include <gcm-color.h>
-#include <gcm-ddc-common.h>
-#include <gcm-ddc-device.h>
-#include <gcm-ddc-client.h>
-#include <gcm-ddc-control.h>
 #include <gcm-sample-window.h>
 #include <gcm-sensor.h>
 #include <gcm-sensor-huey.h>
diff --git a/rules/.gitignore b/rules/.gitignore
index c4433c9..dd521f6 100644
--- a/rules/.gitignore
+++ b/rules/.gitignore
@@ -1,4 +1,3 @@
 .deps
 .libs
 *.o
-gcm-udev-ddc
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 7e77931..e2fea9a 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -1,33 +1,7 @@
-INCLUDES =							\
-	$(GLIB_CFLAGS)						\
-	$(GUDEV_CFLAGS)						\
-	$(GTK_CFLAGS)						\
-	-I$(top_srcdir)/libcolor-glib				\
-	-DG_UDEV_API_IS_SUBJECT_TO_CHANGE			\
-	-DI_KNOW_THE_LIBCOLOR_GLIB_API_IS_SUBJECT_TO_CHANGE
-
-COLOR_GLIB_LIBS =						\
-	$(top_builddir)/libcolor-glib/libcolor-glib.la
-
 udevrulesdir = $(slashlibdir)/udev/rules.d
 udevrules_DATA =						\
 	95-gcm-colorimeters.rules				\
-	95-gcm-devices.rules					\
-	55-gcm-i2c.rules
-
-udevproberdir = $(slashlibdir)/udev
-udevprober_PROGRAMS =						\
-	gcm-udev-ddc
-
-gcm_udev_ddc_SOURCES =						\
-	gcm-udev-ddc.c
-
-gcm_udev_ddc_LDADD =						\
-	$(COLOR_GLIB_LIBS)					\
-	-lm
-
-gcm_udev_ddc_CFLAGS =						\
-	$(WARNINGFLAGS_C)
+	95-gcm-devices.rules
 
 EXTRA_DIST =							\
 	$(udevrules_DATA)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8a8a520..f657836 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -28,7 +28,6 @@ noinst_PROGRAMS =					\
 	gcm-dump-sensor					\
 	gcm-dump-edid					\
 	gcm-fix-profile					\
-	gcm-ddc-util					\
 	gcm-sensor-example
 
 gcm_dump_edid_SOURCES =					\
@@ -75,15 +74,6 @@ gcm_fix_profile_CFLAGS =				\
 COLOR_GLIB_LIBS =					\
 	$(top_builddir)/libcolor-glib/libcolor-glib.la
 
-gcm_ddc_util_SOURCES =					\
-	gcm-ddc-util.c
-
-gcm_ddc_util_LDADD =					\
-	$(COLOR_GLIB_LIBS)
-
-gcm_ddc_util_CFLAGS =					\
-	$(WARNINGFLAGS_C)
-
 gcm_sensor_example_SOURCES =				\
 	gcm-sensor-example.c