[gnome-color-manager] only enable the calibrate button if ArgyllCMS is installed
- From: Richard Hughes <rhughes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] only enable the calibrate button if ArgyllCMS is installed
- Date: Thu, 5 Nov 2009 13:42:41 +0000 (UTC)
commit d51f67708abf7645d623ce59194eaecb8daa56b6
Author: Richard Hughes <richard hughsie com>
Date: Thu Nov 5 13:35:04 2009 +0000
only enable the calibrate button if ArgyllCMS is installed
src/gcm-prefs.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/src/gcm-prefs.c b/src/gcm-prefs.c
index f2927e9..1401919 100644
--- a/src/gcm-prefs.c
+++ b/src/gcm-prefs.c
@@ -713,20 +713,26 @@ static void
gcm_prefs_check_calibration_hardware (void)
{
gboolean ret;
-#ifdef GCM_HARDWARE_DETECTION
GtkWidget *widget;
-#endif
+
+ /* find whether argyllcms is installed */
+ ret = g_file_test ("/usr/bin/dispcal", G_FILE_TEST_EXISTS);
+ if (!ret) {
+ egg_debug ("ArgyllCMS not installed");
+ goto out;
+ }
/* find whether we have hardware installed */
ret = gcm_prefs_has_hardware_device_attached ();
-#ifdef GCM_HARDWARE_DETECTION
+#ifndef GCM_HARDWARE_DETECTION
+ egg_debug ("overriding device presence %i with TRUE", ret);
+ ret = TRUE;
+#endif
+out:
/* disable the button if no supported hardware is found */
widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_calibrate"));
gtk_widget_set_sensitive (widget, ret);
-#else
- egg_debug ("not setting calibrate button %s as not compiled with hardware detection", ret ? "sensitive" : "insensitive");
-#endif
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]