[gnome-color-manager] trivial: Ignore a pointless error from Argyll



commit 9c145e50236513f66fab3766037aadd498c88e78
Author: Richard Hughes <richard hughsie com>
Date:   Sat Feb 6 13:40:59 2010 +0000

    trivial: Ignore a pointless error from Argyll

 src/gcm-calibrate-argyll.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/src/gcm-calibrate-argyll.c b/src/gcm-calibrate-argyll.c
index 23280f5..c6217a5 100644
--- a/src/gcm-calibrate-argyll.c
+++ b/src/gcm-calibrate-argyll.c
@@ -1240,6 +1240,7 @@ gcm_calibrate_argyll_process_output_cmd (GcmCalibrateArgyll *calibrate_argyll, c
 	    g_strcmp0 (line, "Calibration complete") == 0 ||
 	    g_strcmp0 (line, "or hit Esc or Q to abort:") == 0 ||
 	    g_strcmp0 (line, "The instrument can be removed from the screen.") == 0 ||
+	    g_strstr_len (line, -1, "User Aborted") != NULL ||
 	    g_str_has_suffix (line, "key to continue:")) {
 		egg_debug ("VTE: ignore: %s", line);
 		goto out;



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