[gnome-settings-daemon] Bump the colord dep to 0.1.34 due to the OutputEdidMd5 metadata
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] Bump the colord dep to 0.1.34 due to the OutputEdidMd5 metadata
- Date: Wed, 29 May 2013 09:07:36 +0000 (UTC)
commit 1502545077e7c6bcbdb390f9ecd6ea931e905484
Author: Richard Hughes <richard hughsie com>
Date: Wed May 29 10:06:20 2013 +0100
Bump the colord dep to 0.1.34 due to the OutputEdidMd5 metadata
configure.ac | 2 +-
plugins/color/gsd-color-manager.c | 8 --------
2 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 872c58f..5210f0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,7 +242,7 @@ dnl ---------------------------------------------------------------------------
dnl - color
dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.32 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
libcanberra-gtk3])
+PKG_CHECK_MODULES(COLOR, [colord >= 0.1.34 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
libcanberra-gtk3])
dnl ---------------------------------------------------------------------------
dnl - wacom (disabled for s390/s390x and non Linux platforms)
diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
index 235e487..93064e7 100644
--- a/plugins/color/gsd-color-manager.c
+++ b/plugins/color/gsd-color-manager.c
@@ -1067,21 +1067,16 @@ gcm_session_add_x11_output (GsdColorManager *manager, GnomeRROutput *output)
g_hash_table_insert (device_props,
(gpointer) CD_DEVICE_METADATA_XRANDR_NAME,
(gpointer) gnome_rr_output_get_name (output));
-#if CD_CHECK_VERSION(0,1,25)
g_hash_table_insert (device_props,
(gpointer) CD_DEVICE_METADATA_OUTPUT_PRIORITY,
gnome_rr_output_get_is_primary (output) ?
(gpointer) CD_DEVICE_METADATA_OUTPUT_PRIORITY_PRIMARY :
(gpointer) CD_DEVICE_METADATA_OUTPUT_PRIORITY_SECONDARY);
-#endif
-#if CD_CHECK_VERSION(0,1,34)
if (edid_checksum != NULL) {
g_hash_table_insert (device_props,
(gpointer) CD_DEVICE_METADATA_OUTPUT_EDID_MD5,
(gpointer) edid_checksum);
}
-#endif
-#if CD_CHECK_VERSION(0,1,27)
/* set this so we can call the device a 'Laptop Screen' in the
* control center main panel */
if (gnome_rr_output_is_builtin_display (output)) {
@@ -1089,7 +1084,6 @@ gcm_session_add_x11_output (GsdColorManager *manager, GnomeRROutput *output)
(gpointer) CD_DEVICE_PROPERTY_EMBEDDED,
NULL);
}
-#endif
cd_client_create_device (priv->client,
device_id,
CD_OBJECT_SCOPE_TEMP,
@@ -1281,14 +1275,12 @@ gcm_session_client_connect_cb (GObject *source_object,
return;
}
-#if CD_CHECK_VERSION(0,1,12)
/* is there an available colord instance? */
ret = cd_client_get_has_server (manager->priv->client);
if (!ret) {
g_warning ("There is no colord server available");
goto out;
}
-#endif
/* add profiles */
gcm_profile_store_search (priv->profile_store);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]