[gnome-color-manager: 66/80] trivial: move GcmBrightness to libcolor-glib

[Richard Hughes <rhughes src gnome org>]

commit 6cee1b4f4cc4978eac31656adf57b5acfb2dd520
Author: Richard Hughes <richard hughsie com>
Date:   Sun Jul 18 13:12:39 2010 +0100

    trivial: move GcmBrightness to libcolor-glib

 libcolor-glib/Makefile.am               |    2 +
 {src => libcolor-glib}/gcm-brightness.c |    0
 {src => libcolor-glib}/gcm-brightness.h |    4 +++
 libcolor-glib/gcm-self-test.c           |   36 +++++++++++++++++++++++++++++++
 libcolor-glib/libcolor-glib.h           |    1 +
 src/Makefile.am                         |    4 +--
 src/gcm-self-test.c                     |   34 -----------------------------
 7 files changed, 44 insertions(+), 37 deletions(-)
---
diff --git a/libcolor-glib/Makefile.am b/libcolor-glib/Makefile.am
index b9c40ae..a34f1d6 100644
--- a/libcolor-glib/Makefile.am
+++ b/libcolor-glib/Makefile.am
@@ -86,6 +86,8 @@ libcolor_glib_la_SOURCES =					\
 	gcm-xserver.c						\
 	gcm-xserver.h						\
 	gcm-version.h						\
+	gcm-brightness.c					\
+	gcm-brightness.h					\
 	$(NULL)
 
 libcolor_glib_la_LIBADD =					\
diff --git a/src/gcm-brightness.c b/libcolor-glib/gcm-brightness.c
similarity index 100%
rename from src/gcm-brightness.c
rename to libcolor-glib/gcm-brightness.c
diff --git a/src/gcm-brightness.h b/libcolor-glib/gcm-brightness.h
similarity index 94%
rename from src/gcm-brightness.h
rename to libcolor-glib/gcm-brightness.h
index e72ac6b..5faeebe 100644
--- a/src/gcm-brightness.h
+++ b/libcolor-glib/gcm-brightness.h
@@ -19,6 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
+#endif
+
 #ifndef __GCM_BRIGHTNESS_H
 #define __GCM_BRIGHTNESS_H
 
diff --git a/libcolor-glib/gcm-self-test.c b/libcolor-glib/gcm-self-test.c
index 926c536..e7adac0 100644
--- a/libcolor-glib/gcm-self-test.c
+++ b/libcolor-glib/gcm-self-test.c
@@ -530,6 +530,39 @@ gcm_test_profile_store_func (void)
 	g_object_unref (store);
 }
 
+static void
+gcm_test_brightness_func (void)
+{
+	GcmBrightness *brightness;
+	gboolean ret;
+	GError *error = NULL;
+	guint orig_percentage;
+	guint percentage;
+
+	brightness = gcm_brightness_new ();
+	g_assert (brightness != NULL);
+
+	ret = gcm_brightness_get_percentage (brightness, &orig_percentage, &error);
+	g_assert_no_error (error);
+	g_assert (ret);
+
+	ret = gcm_brightness_set_percentage (brightness, 10, &error);
+	g_assert_no_error (error);
+	g_assert (ret);
+
+	ret = gcm_brightness_get_percentage (brightness, &percentage, &error);
+	g_assert_no_error (error);
+	g_assert (ret);
+	g_assert_cmpint (percentage, >, 5);
+	g_assert_cmpint (percentage, <, 15);
+
+	ret = gcm_brightness_set_percentage (brightness, orig_percentage, &error);
+	g_assert_no_error (error);
+	g_assert (ret);
+
+	g_object_unref (brightness);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -549,6 +582,9 @@ main (int argc, char **argv)
 	g_test_add_func ("/libcolor-glib/xyz", gcm_test_xyz_func);
 	g_test_add_func ("/libcolor-glib/dmi", gcm_test_dmi_func);
 	g_test_add_func ("/libcolor-glib/profile_store", gcm_test_profile_store_func);
+	if (g_test_thorough ()) {
+		g_test_add_func ("/libcolor-glib/brightness", gcm_test_brightness_func);
+	}
 
 	return g_test_run ();
 }
diff --git a/libcolor-glib/libcolor-glib.h b/libcolor-glib/libcolor-glib.h
index 18a2944..0427218 100644
--- a/libcolor-glib/libcolor-glib.h
+++ b/libcolor-glib/libcolor-glib.h
@@ -42,6 +42,7 @@
 #include <gcm-clut.h>
 #include <gcm-dmi.h>
 #include <gcm-xserver.h>
+#include <gcm-brightness.h>
 #include <gcm-profile-store.h>
 
 #undef __LIBCOLOR_GLIB_H_INSIDE__
diff --git a/src/Makefile.am b/src/Makefile.am
index 839a5b4..cacd24a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -77,9 +77,7 @@ libgcmshared_a_SOURCES =				\
 	gcm-calibrate-manual.c				\
 	gcm-calibrate-manual.h				\
 	gcm-calibrate-dialog.c				\
-	gcm-calibrate-dialog.h				\
-	gcm-brightness.c				\
-	gcm-brightness.h
+	gcm-calibrate-dialog.h
 
 libgcmshared_a_SOURCES +=				\
 	gcm-device-sane.c				\
diff --git a/src/gcm-self-test.c b/src/gcm-self-test.c
index d151d8a..1952bf3 100644
--- a/src/gcm-self-test.c
+++ b/src/gcm-self-test.c
@@ -124,39 +124,6 @@ gcm_test_assert_basename (const gchar *filename1, const gchar *filename2)
 }
 
 static void
-gcm_test_brightness_func (void)
-{
-	GcmBrightness *brightness;
-	gboolean ret;
-	GError *error = NULL;
-	guint orig_percentage;
-	guint percentage;
-
-	brightness = gcm_brightness_new ();
-	g_assert (brightness != NULL);
-
-	ret = gcm_brightness_get_percentage (brightness, &orig_percentage, &error);
-	g_assert_no_error (error);
-	g_assert (ret);
-
-	ret = gcm_brightness_set_percentage (brightness, 10, &error);
-	g_assert_no_error (error);
-	g_assert (ret);
-
-	ret = gcm_brightness_get_percentage (brightness, &percentage, &error);
-	g_assert_no_error (error);
-	g_assert (ret);
-	g_assert_cmpint (percentage, >, 5);
-	g_assert_cmpint (percentage, <, 15);
-
-	ret = gcm_brightness_set_percentage (brightness, orig_percentage, &error);
-	g_assert_no_error (error);
-	g_assert (ret);
-
-	g_object_unref (brightness);
-}
-
-static void
 gcm_test_calibrate_func (void)
 {
 	GcmCalibrate *calibrate;
@@ -812,7 +779,6 @@ main (int argc, char **argv)
 	g_test_add_func ("/color/device", gcm_test_device_func);
 	g_test_add_func ("/color/calibrate_dialog", gcm_test_calibrate_dialog_func);
 	if (g_test_thorough ()) {
-		g_test_add_func ("/color/brightness", gcm_test_brightness_func);
 		g_test_add_func ("/color/trc", gcm_test_trc_widget_func);
 		g_test_add_func ("/color/cie", gcm_test_cie_widget_func);
 		g_test_add_func ("/color/gamma_widget", gcm_test_gamma_widget_func);