[gnome-color-manager] Remove GCM_HARDWARE_DETECTION as we're now shipping our own udev rules
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Remove GCM_HARDWARE_DETECTION as we're now shipping our own udev rules
- Date: Sun, 28 Feb 2010 20:32:53 +0000 (UTC)
commit ac1b59c4e82366cca3a24ce6811e92988e4c4608
Author: Richard Hughes <richard hughsie com>
Date: Sun Feb 28 20:32:27 2010 +0000
Remove GCM_HARDWARE_DETECTION as we're now shipping our own udev rules
configure.ac | 13 +------------
src/gcm-prefs.c | 4 ----
2 files changed, 1 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ba4a545..8491543 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,24 +222,13 @@ fi
AM_CONDITIONAL(HAVE_DOCBOOK2MAN, [test "$DOCBOOK2MAN" != "no"])
dnl ---------------------------------------------------------------------------
-dnl - Autodetect the hardware device
-dnl - This requires 55-Argyll.rules to set COLOR_MEASUREMENT_DEVICE
-dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(hardware_detection, AS_HELP_STRING([--enable-hardware-detection],[enable hardware auto-detection (requires fixed argyllcms)]),
- enable_hardware_detection=$enableval,enable_hardware_detection=yes)
-AM_CONDITIONAL(GCM_HARDWARE_DETECTION, test x$enable_hardware_detection = xyes)
-if test x$enable_hardware_detection = xyes; then
- AC_DEFINE(GCM_HARDWARE_DETECTION,1,[Build hardware autodetection])
-fi
-
-dnl ---------------------------------------------------------------------------
dnl - Use PackageKit to install missing tools
dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(packagekit, AS_HELP_STRING([--enable-packagekit],[enable PackageKit integration]),
enable_packagekit=$enableval,enable_packagekit=yes)
AM_CONDITIONAL(GCM_USE_PACKAGEKIT, test x$enable_packagekit = xyes)
if test x$enable_packagekit = xyes; then
- AC_DEFINE(GCM_USE_PACKAGEKIT,1,[Build hardware autodetection])
+ AC_DEFINE(GCM_USE_PACKAGEKIT,1,[Use PackageKit for installing packages])
fi
dnl ---------------------------------------------------------------------------
diff --git a/src/gcm-prefs.c b/src/gcm-prefs.c
index dcb1bc4..84aeff4 100644
--- a/src/gcm-prefs.c
+++ b/src/gcm-prefs.c
@@ -1126,10 +1126,6 @@ gcm_prefs_set_calibrate_button_sensitivity (void)
/* find whether we have hardware installed */
ret = gcm_colorimeter_get_present (colorimeter);
-#ifndef GCM_HARDWARE_DETECTION
- egg_debug ("overriding device presence %i with TRUE", ret);
- ret = TRUE;
-#endif
if (!ret) {
/* TRANSLATORS: this is when the button is insensitive */
tooltip = _("Cannot calibrate: The colorimeter is not plugged in");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]