[gnome-color-manager] Do not show a critical warning if we re-try a failed calibration

[Richard Hughes <rhughes src gnome org>]

commit f502305d6d0f9205a2897c49937305bd2536c2b9
Author: Richard Hughes <richard hughsie com>
Date:   Mon Feb 27 13:40:58 2012 +0000

    Do not show a critical warning if we re-try a failed calibration
    
    Ensure we uninhibit the display even after a failed calibration.

 src/gcm-calibrate.c |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/src/gcm-calibrate.c b/src/gcm-calibrate.c
index 704b158..1768b00 100644
--- a/src/gcm-calibrate.c
+++ b/src/gcm-calibrate.c
@@ -2042,24 +2042,39 @@ gcm_calibrate_device (GcmCalibrate *calibrate,
 					     device,
 					     window,
 					     error);
-		if (!ret)
+		if (!ret) {
+			/* we don't care about the success or error */
+			cd_device_profiling_uninhibit_sync (device,
+							    NULL,
+							    NULL);
 			goto out;
+		}
 		break;
 	case CD_DEVICE_KIND_PRINTER:
 		ret = gcm_calibrate_printer (calibrate,
 					     device,
 					     window,
 					     error);
-		if (!ret)
+		if (!ret) {
+			/* we don't care about the success or error */
+			cd_device_profiling_uninhibit_sync (device,
+							    NULL,
+							    NULL);
 			goto out;
+		}
 		break;
 	default:
 		ret = gcm_calibrate_camera (calibrate,
 					    device,
 					    window,
 					    error);
-		if (!ret)
+		if (!ret) {
+			/* we don't care about the success or error */
+			cd_device_profiling_uninhibit_sync (device,
+							    NULL,
+							    NULL);
 			goto out;
+		}
 		break;
 	}