GNOME.org
 

[gnome-color-manager] Do not install the low-level unitilies, and move them to 'tools'

commit 4fa423145eb83970978a55729a26e600166bb290
Author: Richard Hughes <richard hughsie com>
Date:   Thu Jul 22 12:26:17 2010 +0100

    Do not install the low-level unitilies, and move them to 'tools'

 Makefile.am                            |    1 +
 configure.ac                           |    1 +
 libcolor-glib/gcm-sensor-huey.c        |   29 +++++++
 libcolor-glib/gcm-sensor.c             |   50 +++++++++++++
 libcolor-glib/gcm-sensor.h             |    6 ++
 po/POTFILES.in                         |    3 -
 po/POTFILES.skip                       |    1 +
 src/.gitignore                         |    6 --
 src/Makefile.am                        |   83 +--------------------
 tools/.gitignore                       |   13 +++
 tools/Makefile.am                      |  127 ++++++++++++++++++++++++++++++++
 tools/egg-debug.c                      |    1 +
 tools/egg-debug.h                      |    1 +
 {src => tools}/gcm-ddc-util.c          |    0
 {src => tools}/gcm-dump-edid.c         |   62 +++++-----------
 {src => tools}/gcm-dump-profile.c      |   11 +--
 {src => tools}/gcm-fix-profile.c       |   18 ++---
 {src => tools}/gcm-glsl-demo.c         |    0
 {src => tools}/gcm-sensor-colormunki.c |    0
 {src => tools}/gcm-sensor-colormunki.h |    0
 {src => tools}/gcm-sensor-example.c    |    0
 21 files changed, 260 insertions(+), 153 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2b98185..0121d84 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS = 						\
 	po						\
 	policy						\
 	rules						\
+	tools						\
 	src
 
 snapshot:
diff --git a/configure.ac b/configure.ac
index f3d2974..d34767d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -315,6 +315,7 @@ policy/Makefile
 po/Makefile.in
 rules/Makefile
 src/Makefile
+tools/Makefile
 docs/Makefile
 docs/huey/Makefile
 docs/api/Makefile
diff --git a/libcolor-glib/gcm-sensor-huey.c b/libcolor-glib/gcm-sensor-huey.c
index 263545f..94ae131 100644
--- a/libcolor-glib/gcm-sensor-huey.c
+++ b/libcolor-glib/gcm-sensor-huey.c
@@ -808,6 +808,34 @@ out:
 }
 
 /**
+ * gcm_sensor_huey_dump:
+ **/
+static gboolean
+gcm_sensor_huey_dump (GcmSensor *sensor, GString *data, GError **error)
+{
+	GcmSensorHuey *sensor_huey = GCM_SENSOR_HUEY (sensor);
+	GcmSensorHueyPrivate *priv = sensor_huey->priv;
+	gboolean ret;
+	guint i;
+	guint8 value;
+
+	/* dump the unlock string */
+	g_string_append_printf (data, "huey dump version: %i\n", 1);
+	g_string_printf (data, "unlock string: %s\n", priv->unlock_string);
+
+	/* read all the register space */
+	for (i=0; i<0xff; i++) {
+		ret = gcm_sensor_huey_read_register_byte (sensor_huey, i, &value, error);
+		if (!ret)
+			goto out;
+		/* write details */
+		g_string_append_printf (data, "0x%02x: 0x%02x\n", i, value);
+	}
+out:
+	return ret;
+}
+
+/**
  * gcm_sensor_huey_class_init:
  **/
 static void
@@ -822,6 +850,7 @@ gcm_sensor_huey_class_init (GcmSensorHueyClass *klass)
 	parent_class->set_leds = gcm_sensor_huey_set_leds;
 	parent_class->sample = gcm_sensor_huey_sample;
 	parent_class->startup = gcm_sensor_huey_startup;
+	parent_class->dump = gcm_sensor_huey_dump;
 
 	g_type_class_add_private (klass, sizeof (GcmSensorHueyPrivate));
 }
diff --git a/libcolor-glib/gcm-sensor.c b/libcolor-glib/gcm-sensor.c
index 240f481..0324671 100644
--- a/libcolor-glib/gcm-sensor.c
+++ b/libcolor-glib/gcm-sensor.c
@@ -379,6 +379,56 @@ out:
 }
 
 /**
+ * gcm_sensor_dump:
+ * @sensor: a valid #GcmSensor instance
+ * @data: A valid #GString for the returned data
+ * @error: a #GError or %NULL
+ *
+ * Dumps the unstructured device data to a string.
+ *
+ * Return value: %TRUE for success.
+ **/
+gboolean
+gcm_sensor_dump (GcmSensor *sensor, GString *data, GError **error)
+{
+	GcmSensorClass *klass = GCM_SENSOR_GET_CLASS (sensor);
+	GcmSensorPrivate *priv = sensor->priv;
+	gboolean ret = FALSE;
+
+	/* do startup if not yet done */
+	if (!sensor->priv->done_startup) {
+		ret = gcm_sensor_startup (sensor, error);
+		if (!ret)
+			goto out;
+	}
+
+	/* write common sensor details */
+	g_string_append (data, "AUTOMATICALLY GENERATED -- DO NOT EDIT\n");
+	g_string_append_printf (data, "generic dump version: %i\n", 1);
+	g_string_append_printf (data, "kind: %s\n", gcm_sensor_kind_to_string (priv->kind));
+	g_string_append_printf (data, "vendor: %s\n", priv->vendor);
+	g_string_append_printf (data, "model: %s\n", priv->model);
+	g_string_append_printf (data, "device: %s\n", priv->device);
+	g_string_append (data, "\n");
+
+	/* dump sensor */
+	g_string_append (data, "device specific data:\n");
+	if (klass->dump == NULL) {
+		ret = FALSE;
+		g_set_error_literal (error,
+				     GCM_SENSOR_ERROR,
+				     GCM_SENSOR_ERROR_INTERNAL,
+				     "no klass support");
+		goto out;
+	}
+
+	/* proxy */
+	ret = klass->dump (sensor, data, error);
+out:
+	return ret;
+}
+
+/**
  * gcm_sensor_sample:
  * @sensor: a valid #GcmSensor instance
  * @value: The returned value
diff --git a/libcolor-glib/gcm-sensor.h b/libcolor-glib/gcm-sensor.h
index c169937..f5f3e12 100644
--- a/libcolor-glib/gcm-sensor.h
+++ b/libcolor-glib/gcm-sensor.h
@@ -65,6 +65,9 @@ struct _GcmSensorClass
 							 GError		**error);
 	gboolean	 (*startup)			(GcmSensor	*sensor,
 							 GError		**error);
+	gboolean	 (*dump)			(GcmSensor	*sensor,
+							 GString	*data,
+							 GError		**error);
 	/* signals */
 	void		(* button_pressed)		(void);
 	/* padding for future expansion */
@@ -125,6 +128,9 @@ GType			 gcm_sensor_get_type		(void);
 GcmSensor		*gcm_sensor_new			(void);
 
 void			 gcm_sensor_button_pressed	(GcmSensor		*sensor);
+gboolean		 gcm_sensor_dump		(GcmSensor		*sensor,
+							 GString		*data,
+							 GError			**error);
 gboolean		 gcm_sensor_get_ambient		(GcmSensor		*sensor,
 							 gdouble		*value,
 							 GError			**error);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 80246ff..3bcca55 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,9 +14,6 @@ src/gcm-calibrate-manual.c
 src/gcm-cell-renderer-profile.c
 src/gcm-client.c
 src/gcm-device-xrandr.c
-src/gcm-dump-edid.c
-src/gcm-dump-profile.c
-src/gcm-fix-profile.c
 src/gcm-import.c
 src/gcm-inspect.c
 src/gcm-install-system-wide.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 477ef37..844a629 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1,2 @@
 libcolor-glib/egg-debug.c
+tools/egg-debug.c
diff --git a/src/.gitignore b/src/.gitignore
index 71aeb6f..a3c1b88 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -11,12 +11,6 @@ gcm-viewer
 gcm-picker
 gcm-inspect
 gcm-session
-gcm-dump-edid
-gcm-dump-profile
-gcm-fix-profile
 gcm-self-test
 gcm-install-system-wide
 gcm-helper-exiv
-gcm-glsl-demo
-gcm-ddc-util
-gcm-sensor-example
diff --git a/src/Makefile.am b/src/Makefile.am
index c7a5eff..2b5590d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -90,16 +90,11 @@ sbin_PROGRAMS =						\
 
 bin_PROGRAMS =						\
 	gcm-inspect					\
-	gcm-dump-profile				\
-	gcm-fix-profile					\
-	gcm-dump-edid					\
 	gcm-apply					\
 	gcm-viewer					\
 	gcm-session					\
 	gcm-picker					\
-	gcm-ddc-util					\
-	gcm-import					\
-	gcm-sensor-example
+	gcm-import
 
 if HAVE_EXIV
 libexec_PROGRAMS = gcm-helper-exiv
@@ -117,59 +112,6 @@ gcm_install_system_wide_LDADD =				\
 gcm_install_system_wide_CFLAGS =			\
 	$(WARNINGFLAGS_C)
 
-gcm_dump_edid_SOURCES =					\
-	gcm-dump-edid.c
-
-gcm_dump_edid_LDADD =					\
-	libgcmshared.a					\
-	$(GLIB_LIBS)					\
-	$(X11_LIBS)					\
-	$(GNOMEDESKTOP_LIBS)				\
-	$(GUDEV_LIBS)					\
-	$(XORG_LIBS)					\
-	$(GTK_LIBS)					\
-	$(SANE_LIBS)					\
-	$(CUPS_LIBS)					\
-	$(COLOR_GLIB_LIBS)				\
-	-lm
-
-gcm_dump_edid_CFLAGS =					\
-	$(WARNINGFLAGS_C)
-
-gcm_dump_profile_SOURCES =				\
-	gcm-dump-profile.c
-
-gcm_dump_profile_LDADD =				\
-	libgcmshared.a					\
-	$(GLIB_LIBS)					\
-	$(X11_LIBS)					\
-	$(GNOMEDESKTOP_LIBS)				\
-	$(GUDEV_LIBS)					\
-	$(XORG_LIBS)					\
-	$(GTK_LIBS)					\
-	$(SANE_LIBS)					\
-	$(CUPS_LIBS)					\
-	$(COLOR_GLIB_LIBS)				\
-	-lm
-
-gcm_dump_profile_CFLAGS =				\
-	$(WARNINGFLAGS_C)
-
-gcm_fix_profile_SOURCES =				\
-	gcm-fix-profile.c
-
-gcm_fix_profile_LDADD =					\
-	$(GLIB_LIBS)					\
-	$(X11_LIBS)					\
-	$(GTK_LIBS)					\
-	$(SANE_LIBS)					\
-	$(CUPS_LIBS)					\
-	$(LCMS_LIBS)					\
-	-lm
-
-gcm_fix_profile_CFLAGS =				\
-	$(WARNINGFLAGS_C)
-
 gcm_inspect_SOURCES =					\
 	gcm-inspect.c
 
@@ -326,16 +268,6 @@ libcolor_la_CFLAGS = $(WARNINGFLAGS_C)
 COLOR_GLIB_LIBS =						\
 	$(top_builddir)/libcolor-glib/libcolor-glib.la
 
-gcm_ddc_util_SOURCES =					\
-	gcm-ddc-util.c
-
-gcm_ddc_util_LDADD =					\
-	$(GLIB_LIBS)					\
-	$(COLOR_GLIB_LIBS)
-
-gcm_ddc_util_CFLAGS =					\
-	$(WARNINGFLAGS_C)
-
 if HAVE_TESTS
 
 check_PROGRAMS =					\
@@ -371,19 +303,6 @@ install-data-hook:
 		mkdir -p $(DESTDIR)$(GCM_SYSTEM_PROFILES_DIR); \
 	fi
 
-gcm_sensor_example_SOURCES =				\
-	gcm-sensor-colormunki.c				\
-	gcm-sensor-colormunki.h				\
-	gcm-sensor-example.c
-
-gcm_sensor_example_LDADD =				\
-	libgcmshared.a					\
-	$(GLIB_LIBS)					\
-	$(COLOR_GLIB_LIBS)
-
-gcm_sensor_example_CFLAGS =				\
-	$(WARNINGFLAGS_C)
-
 clean-local:
 	rm -f *~
 
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 0000000..ad966e6
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,13 @@
+*.o
+*.a
+*.lo
+*.la
+*.bin
+.libs
+.deps
+gcm-dump-edid
+gcm-dump-profile
+gcm-fix-profile
+gcm-glsl-demo
+gcm-ddc-util
+gcm-sensor-example
diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 0000000..4f5b592
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,127 @@
+INCLUDES =						\
+	$(GLIB_CFLAGS)					\
+	$(X11_CFLAGS)					\
+	$(GTK_CFLAGS)					\
+	$(GNOMEDESKTOP_CFLAGS)				\
+	$(VTE_CFLAGS)					\
+	$(XORG_CFLAGS)					\
+	$(CUPS_CFLAGS)					\
+	$(SANE_CFLAGS)					\
+	$(TIFF_CFLAGS)					\
+	$(EXIF_CFLAGS)					\
+	$(EXIV_CFLAGS)					\
+	$(NOTIFY_CFLAGS)				\
+	$(CANBERRA_CFLAGS)				\
+	$(CONTROL_CENTER_CFLAGS)			\
+	-DG_UDEV_API_IS_SUBJECT_TO_CHANGE		\
+	-DGNOME_DESKTOP_USE_UNSTABLE_API		\
+	$(GUDEV_CFLAGS)					\
+	-I$(top_srcdir)/libcolor-glib			\
+	-DLIBCOLOR_GLIB_COMPILATION			\
+	-DBINDIR=\"$(bindir)\"				\
+	-DLIBEXECDIR=\"$(libexecdir)\"			\
+	-DSBINDIR=\"$(sbindir)\"			\
+	-DDATADIR=\"$(datadir)\"			\
+	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
+	-DVERSION="\"$(VERSION)\""			\
+	-DLOCALEDIR=\""$(localedir)"\"			\
+	-DTESTDATADIR=\""$(top_srcdir)/data/tests"\"	\
+	-DGCM_SYSTEM_PROFILES_DIR="\"$(GCM_SYSTEM_PROFILES_DIR)"\" \
+	-DI_KNOW_THE_LIBCOLOR_GLIB_API_IS_SUBJECT_TO_CHANGE	\
+	-DGCM_DATA=\"$(pkgdatadir)\"
+
+noinst_PROGRAMS =					\
+	gcm-dump-profile				\
+	gcm-fix-profile					\
+	gcm-ddc-util					\
+	gcm-sensor-example
+
+if FALSE
+gcm_dump_edid_SOURCES =					\
+	gcm-dump-edid.c
+
+gcm_dump_edid_LDADD =					\
+	$(GLIB_LIBS)					\
+	$(X11_LIBS)					\
+	$(GNOMEDESKTOP_LIBS)				\
+	$(GUDEV_LIBS)					\
+	$(XORG_LIBS)					\
+	$(GTK_LIBS)					\
+	$(SANE_LIBS)					\
+	$(CUPS_LIBS)					\
+	$(COLOR_GLIB_LIBS)				\
+	-lm
+
+gcm_dump_edid_CFLAGS =					\
+	$(WARNINGFLAGS_C)
+endif
+
+gcm_dump_profile_SOURCES =				\
+	gcm-dump-profile.c
+
+gcm_dump_profile_LDADD =				\
+	$(GLIB_LIBS)					\
+	$(X11_LIBS)					\
+	$(GNOMEDESKTOP_LIBS)				\
+	$(GUDEV_LIBS)					\
+	$(XORG_LIBS)					\
+	$(GTK_LIBS)					\
+	$(SANE_LIBS)					\
+	$(CUPS_LIBS)					\
+	$(COLOR_GLIB_LIBS)				\
+	-lm
+
+gcm_dump_profile_CFLAGS =				\
+	$(WARNINGFLAGS_C)
+
+gcm_fix_profile_SOURCES =				\
+	gcm-fix-profile.c
+
+gcm_fix_profile_LDADD =					\
+	$(GLIB_LIBS)					\
+	$(X11_LIBS)					\
+	$(GTK_LIBS)					\
+	$(SANE_LIBS)					\
+	$(CUPS_LIBS)					\
+	$(LCMS_LIBS)					\
+	-lm
+
+gcm_fix_profile_CFLAGS =				\
+	$(WARNINGFLAGS_C)
+
+COLOR_GLIB_LIBS =						\
+	$(top_builddir)/libcolor-glib/libcolor-glib.la
+
+gcm_ddc_util_SOURCES =					\
+	gcm-ddc-util.c
+
+gcm_ddc_util_LDADD =					\
+	$(GLIB_LIBS)					\
+	$(COLOR_GLIB_LIBS)
+
+gcm_ddc_util_CFLAGS =					\
+	$(WARNINGFLAGS_C)
+
+gcm_sensor_example_SOURCES =				\
+	egg-debug.c					\
+	egg-debug.h					\
+	gcm-sensor-colormunki.c				\
+	gcm-sensor-colormunki.h				\
+	gcm-sensor-example.c
+
+gcm_sensor_example_LDADD =				\
+	$(GLIB_LIBS)					\
+	$(COLOR_GLIB_LIBS)
+
+gcm_sensor_example_CFLAGS =				\
+	$(WARNINGFLAGS_C)
+
+clean-local:
+	rm -f *~
+
+CLEANFILES = $(BUILT_SOURCES)
+
+MAINTAINERCLEANFILES =					\
+	*~						\
+	Makefile.in
+
diff --git a/tools/egg-debug.c b/tools/egg-debug.c
new file mode 120000
index 0000000..0a3eb62
--- /dev/null
+++ b/tools/egg-debug.c
@@ -0,0 +1 @@
+../src/egg-debug.c
\ No newline at end of file
diff --git a/tools/egg-debug.h b/tools/egg-debug.h
new file mode 120000
index 0000000..db811d2
--- /dev/null
+++ b/tools/egg-debug.h
@@ -0,0 +1 @@
+../src/egg-debug.h
\ No newline at end of file
diff --git a/src/gcm-ddc-util.c b/tools/gcm-ddc-util.c
similarity index 100%
rename from src/gcm-ddc-util.c
rename to tools/gcm-ddc-util.c
diff --git a/src/gcm-dump-edid.c b/tools/gcm-dump-edid.c
similarity index 69%
rename from src/gcm-dump-edid.c
rename to tools/gcm-dump-edid.c
index 15cfabb..e39e8ef 100644
--- a/src/gcm-dump-edid.c
+++ b/tools/gcm-dump-edid.c
@@ -28,7 +28,6 @@
 
 #include "egg-debug.h"
 
-#include "gcm-utils.h"
 #include "gcm-screen.h"
 #include "gcm-edid.h"
 
@@ -54,8 +53,7 @@ gcm_dump_edid_filename (const gchar *filename)
 	/* load */
 	ret = g_file_get_contents (filename, &data, NULL, &error);
 	if (!ret) {
-		/* TRANSLATORS: this is when the EDID file cannot be read */
-		g_print ("%s %s\n", _("Cannot load file contents:"), error->message);
+		g_print ("Cannot load file contents: %s\n", error->message);
 		goto out;
 	}
 
@@ -63,48 +61,33 @@ gcm_dump_edid_filename (const gchar *filename)
 	edid = gcm_edid_new ();
 	ret = gcm_edid_parse (edid, (const guint8 *) data, &error);
 	if (!ret) {
-		/* TRANSLATORS: this is when the EDID cannot be parsed */
-		g_print ("%s %s\n", _("Cannot parse EDID contents:"), error->message);
+		g_print ("Cannot parse EDID contents: %s\n", error->message);
 		goto out;
 	}
 
 	/* print data */
 	monitor_name = gcm_edid_get_monitor_name (edid);
-	if (monitor_name != NULL) {
-		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s %s\n", _("Monitor name:"), monitor_name);
-	}
+	if (monitor_name != NULL)
+		g_print ("  Monitor name: %s\n", monitor_name);
 	vendor_name = gcm_edid_get_vendor_name (edid);
-	if (vendor_name != NULL) {
-		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s %s\n", _("Vendor name:"), vendor_name);
-	}
+	if (vendor_name != NULL)
+		g_print ("  Vendor name: %s\n", vendor_name);
 	serial_number = gcm_edid_get_serial_number (edid);
-	if (serial_number != NULL) {
-		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s %s\n", _("Serial number:"), serial_number);
-	}
+	if (serial_number != NULL)
+		g_print ("  Serial number: %s\n", serial_number);
 	eisa_id = gcm_edid_get_eisa_id (edid);
-	if (eisa_id != NULL) {
-		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s %s\n", _("EISA ID:"), eisa_id);
-	}
+	if (eisa_id != NULL)
+		g_print ("  EISA ID: %s\n", eisa_id);
 	pnp_id = gcm_edid_get_pnp_id (edid);
-	if (pnp_id != NULL) {
-		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s %s\n", _("PNP identifier:"), pnp_id);
-	}
+	if (pnp_id != NULL)
+		g_print ("  %s %s\n", "PNP identifier:", pnp_id);
 	width = gcm_edid_get_width (edid);
 	height = gcm_edid_get_height (edid);
-	if (width != 0) {
-		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s %ix%i\n", _("Size:"), width, height);
-	}
+	if (width != 0)
+		g_print ("  Size: %ix%i\n", "", width, height);
 	gamma = gcm_edid_get_gamma (edid);
-	if (gamma > 0.0f) {
-		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s %f\n", _("Gamma:"), gamma);
-	}
+	if (gamma > 0.0f)
+		g_print ("  Gamma: %f\n", gamma);
 out:
 	if (edid != NULL)
 		g_object_unref (edid);
@@ -132,8 +115,7 @@ main (int argc, char **argv)
 
 	const GOptionEntry options[] = {
 		{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &files,
-		  /* TRANSLATORS: command line option: a list of files to parse */
-		  _("EDID dumps to parse"), NULL },
+		  "EDID dumps to parse", NULL },
 		{ NULL}
 	};
 
@@ -155,8 +137,7 @@ main (int argc, char **argv)
 	/* we've specified files, just parse them */
 	if (files != NULL) {
 		for (i=0; files[i] != NULL; i++) {
-			/* TRANSLATORS: this is the filename we are displaying */
-			g_print ("%s %s\n", _("EDID dump:"), files[i]);
+			g_print ("EDID dump: %s\n", files[i]);
 			gcm_dump_edid_filename (files[i]);
 		}
 		goto out;
@@ -192,14 +173,11 @@ main (int argc, char **argv)
 		/* save to disk */
 		ret = g_file_set_contents (filename, (const gchar *) data, 0x80, &error);
 		if (ret) {
-			/* TRANSLATORS: we saved the EDID to a file - second parameter is a filename */
-			g_print (_("Saved %i bytes to %s"), 128, filename);
+			g_print "Saved %i bytes to %s", 128, filename);
 			g_print ("\n");
 			gcm_dump_edid_filename (filename);
 		} else {
-			/* TRANSLATORS: we saved the EDID to a file - parameter is a filename */
-			g_print (_("Failed to save EDID to %s"), filename);
-			g_print (": %s\n", error->message);
+			g_print ("Failed to save EDID to %s: %s\n", filename, error->message);
 			/* non-fatal */
 			g_clear_error (&error);
 		}
diff --git a/src/gcm-dump-profile.c b/tools/gcm-dump-profile.c
similarity index 90%
rename from src/gcm-dump-profile.c
rename to tools/gcm-dump-profile.c
index 43ecc22..6b991ab 100644
--- a/src/gcm-dump-profile.c
+++ b/tools/gcm-dump-profile.c
@@ -25,8 +25,6 @@
 #include <gtk/gtk.h>
 #include <locale.h>
 
-#include "egg-debug.h"
-
 #include "gcm-enum.h"
 #include "gcm-profile.h"
 
@@ -55,7 +53,7 @@ gcm_dump_profile_filename (const gchar *filename)
 	file = g_file_new_for_path (filename);
 	ret = gcm_profile_parse (profile, file, &error);
 	if (!ret) {
-		egg_warning ("failed to parse: %s", error->message);
+		g_warning ("failed to parse: %s", error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -104,8 +102,7 @@ main (int argc, char **argv)
 
 	const GOptionEntry options[] = {
 		{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &files,
-		  /* TRANSLATORS: command line option: a list of files to install */
-		  _("Profiles to view"), NULL },
+		  "Profiles to view", NULL },
 		{ NULL}
 	};
 
@@ -117,10 +114,8 @@ main (int argc, char **argv)
 
 	gtk_init (&argc, &argv);
 
-	/* TRANSLATORS: this just dumps the profile to the screen */
-	context = g_option_context_new (_("ICC profile dump program"));
+	context = g_option_context_new ("ICC profile dump program");
 	g_option_context_add_main_entries (context, options, NULL);
-	g_option_context_add_group (context, egg_debug_get_option_group ());
 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
 	g_option_context_parse (context, &argc, &argv, NULL);
 	g_option_context_free (context);
diff --git a/src/gcm-fix-profile.c b/tools/gcm-fix-profile.c
similarity index 89%
rename from src/gcm-fix-profile.c
rename to tools/gcm-fix-profile.c
index 1a129c5..5cd3b5b 100644
--- a/src/gcm-fix-profile.c
+++ b/tools/gcm-fix-profile.c
@@ -136,20 +136,15 @@ main (int argc, char **argv)
 
 	const GOptionEntry options[] = {
 		{ "description", 'd', 0, G_OPTION_ARG_STRING, &description,
-		  /* TRANSLATORS: command line option */
-		  _("The description of the profile"), NULL },
+		  "The description of the profile", NULL },
 		{ "copyright", 'c', 0, G_OPTION_ARG_STRING, &copyright,
-		  /* TRANSLATORS: command line option */
-		  _("The copyright of the profile"), NULL },
+		  "The copyright of the profile", NULL },
 		{ "model", 'm', 0, G_OPTION_ARG_STRING, &model,
-		  /* TRANSLATORS: command line option */
-		  _("The model of the profile"), NULL },
+		  "The model of the profile", NULL },
 		{ "manufacturer", 'n', 0, G_OPTION_ARG_STRING, &manufacturer,
-		  /* TRANSLATORS: command line option */
-		  _("The manufacturer of the profile"), NULL },
+		  "The manufacturer of the profile", NULL },
 		{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &files,
-		  /* TRANSLATORS: command line option: a list of icc files to fix */
-		  _("Profiles to fix"), NULL },
+		  "Profiles to fix", NULL },
 		{ NULL}
 	};
 
@@ -159,8 +154,7 @@ main (int argc, char **argv)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	/* TRANSLATORS: this fixes broken profiles */
-	context = g_option_context_new (_("ICC profile fix program"));
+	context = g_option_context_new ("ICC profile fix program");
 	g_option_context_add_main_entries (context, options, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
 	g_option_context_free (context);
diff --git a/src/gcm-glsl-demo.c b/tools/gcm-glsl-demo.c
similarity index 100%
rename from src/gcm-glsl-demo.c
rename to tools/gcm-glsl-demo.c
diff --git a/src/gcm-sensor-colormunki.c b/tools/gcm-sensor-colormunki.c
similarity index 100%
rename from src/gcm-sensor-colormunki.c
rename to tools/gcm-sensor-colormunki.c
diff --git a/src/gcm-sensor-colormunki.h b/tools/gcm-sensor-colormunki.h
similarity index 100%
rename from src/gcm-sensor-colormunki.h
rename to tools/gcm-sensor-colormunki.h
diff --git a/src/gcm-sensor-example.c b/tools/gcm-sensor-example.c
similarity index 100%
rename from src/gcm-sensor-example.c
rename to tools/gcm-sensor-example.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]