[gnome-color-manager/colord] trivial: fix compile with new versions of GCC



commit 221f3457ef92d45118688408ab996ce9d58d24e8
Author: Richard Hughes <richard hughsie com>
Date:   Thu Feb 10 17:35:19 2011 +0000

    trivial: fix compile with new versions of GCC

 tools/Makefile.am        |    5 -----
 tools/gcm-dump-profile.c |    8 ++++----
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 57589a1..f1a99c3 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,11 +7,9 @@ INCLUDES =						\
 	$(COLORD_CFLAGS)				\
 	$(CONTROL_CENTER_CFLAGS)			\
 	-DG_UDEV_API_IS_SUBJECT_TO_CHANGE		\
-	-DGNOME_DESKTOP_USE_UNSTABLE_API		\
 	$(GUDEV_CFLAGS)					\
 	-I$(top_srcdir)/src				\
 	-DG_LOG_DOMAIN=\"Gcm\"				\
-	-DLIBCOLOR_GLIB_COMPILATION			\
 	-DBINDIR=\"$(bindir)\"				\
 	-DLIBEXECDIR=\"$(libexecdir)\"			\
 	-DSBINDIR=\"$(sbindir)\"			\
@@ -68,9 +66,6 @@ gcm_fix_profile_LDADD =					\
 gcm_fix_profile_CFLAGS =				\
 	$(WARNINGFLAGS_C)
 
-COLORD_LIBS =					\
-	$(top_builddir)/src/libgcmshared.a
-
 gcm_sensor_example_SOURCES =				\
 	gcm-sensor-example.c
 
diff --git a/tools/gcm-dump-profile.c b/tools/gcm-dump-profile.c
index d7ccb91..3817d15 100644
--- a/tools/gcm-dump-profile.c
+++ b/tools/gcm-dump-profile.c
@@ -41,7 +41,6 @@ gcm_dump_profile_filename (const gchar *filename)
 	guint profile_kind;
 	guint colorspace;
 	guint size;
-	gboolean has_vcgt;
 	const gchar *description;
 	const gchar *copyright;
 	const gchar *manufacturer;
@@ -63,11 +62,12 @@ gcm_dump_profile_filename (const gchar *filename)
 
 	/* print what we know */
 	profile_kind = gcm_profile_get_kind (profile);
-//	g_print ("Kind:\t%s\n", cd_profile_kind_to_string (profile_kind));
+	g_print ("Kind:\t%s\n", cd_profile_kind_to_string (profile_kind));
 	colorspace = gcm_profile_get_colorspace (profile);
-//	g_print ("Colorspace:\t%s\n", cd_colorspace_to_string (colorspace));
+	g_print ("Colorspace:\t%s\n", cd_colorspace_to_string (colorspace));
 	size = gcm_profile_get_size (profile);
-	g_print ("Has VCGT:\t%s\n", has_vcgt ? "Yes" : "No");
+	if (size != 0)
+		g_print ("Size:\t%i\n", size);
 	description = gcm_profile_get_description (profile);
 	if (description != NULL)
 		g_print ("Description:\t%s\n", description);



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