[gnome-color-manager] trivial: Fix the 'Gray' colorspace support



commit 24e1f65b1bf02cd94e5329b5c472e9d60099e993
Author: Richard Hughes <richard hughsie com>
Date:   Fri Sep 24 09:08:58 2010 +0100

    trivial: Fix the 'Gray' colorspace support

 data/org.gnome.color-manager.gschema.xml |    2 +-
 src/cc-color-panel.c                     |    2 +-
 src/gcm-utils.c                          |    4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/data/org.gnome.color-manager.gschema.xml b/data/org.gnome.color-manager.gschema.xml
index 06c3de9..8812cd6 100644
--- a/data/org.gnome.color-manager.gschema.xml
+++ b/data/org.gnome.color-manager.gschema.xml
@@ -71,7 +71,7 @@
       <description>The CMYK profile filename to be used by applications by default.</description>
     </key>
     <key name="colorspace-gray" type="s">
-      <default>'/usr/share/color/icc/Argyll/Gray.icc'</default>
+      <default>'/usr/share/color/icc/Oyranos/Gray.icc'</default>
       <summary>The default gray profile</summary>
       <description>The gray profile filename to be used by applications by default.</description>
     </key>
diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
index 2788c59..8d96aba 100644
--- a/src/cc-color-panel.c
+++ b/src/cc-color-panel.c
@@ -2200,7 +2200,7 @@ cc_color_panel_setup_space_combobox (CcColorPanel *panel, GtkWidget *widget, Gcm
 		colorspace_tmp = gcm_profile_get_colorspace (profile);
 		if (!has_vcgt &&
 		    colorspace == colorspace_tmp &&
-		    (colorspace == GCM_COLORSPACE_CMYK ||
+		    (colorspace != GCM_COLORSPACE_RGB ||
 		     has_colorspace_description)) {
 			cc_color_panel_combobox_add_profile (widget, profile, GCM_PREFS_ENTRY_TYPE_PROFILE, &iter);
 
diff --git a/src/gcm-utils.c b/src/gcm-utils.c
index 8becc55..314fd08 100644
--- a/src/gcm-utils.c
+++ b/src/gcm-utils.c
@@ -605,6 +605,10 @@ gcm_colorspace_to_localised_string (GcmColorspace colorspace)
 		/* TRANSLATORS: this is the colorspace, e.g. cyan, magenta, yellow, black */
 		return _("CMYK");
 	}
+	if (colorspace == GCM_COLORSPACE_GRAY) {
+		/* TRANSLATORS: this is the colorspace type */
+		return _("gray");
+	}
 	return NULL;
 }
 



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