[gnome-color-manager] Make the profile metadata accept regular expressions and add the OSD_x keys



commit 11c960ba30e6842af480735f942fc418041688e5
Author: Richard Hughes <richard hughsie com>
Date:   Thu Jan 12 13:11:20 2012 +0000

    Make the profile metadata accept regular expressions and add the OSD_x keys

 src/gcm-viewer.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/gcm-viewer.c b/src/gcm-viewer.c
index 37c8dba..18ac7cb 100644
--- a/src/gcm-viewer.c
+++ b/src/gcm-viewer.c
@@ -803,23 +803,23 @@ gcm_viewer_is_blacklisted_metadata_key (const gchar *key)
 {
 	guint i;
 	const gchar *blacklist[] = { "prefix",
-				     "EDID_blue_x",
-				     "EDID_blue_y",
+				     "EDID_blue*",
 				     "EDID_date",
 				     "EDID_gamma",
-				     "EDID_green_x",
-				     "EDID_green_y",
+				     "EDID_green*",
 				     "EDID_mnft_id",
 				     "EDID_model_id",
-				     "EDID_red_x",
-				     "EDID_red_y",
-				     "EDID_white_x",
-				     "EDID_white_y",
+				     "EDID_red*",
+				     "EDID_white*",
+				     "OSD_*",			/* OSD controls... */
 				     "vcgt",
+				     "model",
 				     NULL };
 	for (i = 0; blacklist[i] != NULL; i++) {
-		if (g_strcmp0 (blacklist[i], key) == 0)
+		if (g_regex_match_simple (blacklist[i],
+					  key, 0, 0)) {
 			return FALSE;
+		}
 	}
 	return TRUE;
 }



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