[gnome-color-manager] trivial: Don't emit a critical warning if a printer does not have an ICC profile
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] trivial: Don't emit a critical warning if a printer does not have an ICC profile
- Date: Wed, 26 May 2010 16:34:01 +0000 (UTC)
commit ca689df65199e15ae41991d7efb277fe29076c5d
Author: Richard Hughes <richard hughsie com>
Date: Wed May 26 16:49:06 2010 +0100
trivial: Don't emit a critical warning if a printer does not have an ICC profile
src/gcm-device-cups.c | 3 ++-
src/gcm-device.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/gcm-device-cups.c b/src/gcm-device-cups.c
index 00cfebc..9b1e799 100644
--- a/src/gcm-device-cups.c
+++ b/src/gcm-device-cups.c
@@ -157,8 +157,9 @@ gcm_device_cups_set_from_dest (GcmDevice *device, http_t *http, cups_dest_t dest
"manufacturer", manufacturer,
"title", title,
"native-device", device_id,
- "profile-filename", profile_filename,
NULL);
+ if (profile_filename != NULL)
+ gcm_device_set_default_profile_filename (device, profile_filename);
out:
g_free (serial);
g_free (profile_filename);
diff --git a/src/gcm-device.c b/src/gcm-device.c
index a2570ea..3aa951f 100644
--- a/src/gcm-device.c
+++ b/src/gcm-device.c
@@ -1122,9 +1122,9 @@ gcm_device_class_init (GcmDeviceClass *klass)
g_object_class_install_property (object_class, PROP_CONTRAST, pspec);
/**
- * GcmDevice:profile-filename:
+ * GcmDevice:profiles:
*/
- pspec = g_param_spec_pointer ("profile-filename", NULL, NULL,
+ pspec = g_param_spec_pointer ("profiles", NULL, NULL,
G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_PROFILES, pspec);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]