[gnome-color-manager] trivial: remove some debugging that crept in



commit 4a8c33ccbd04453c4e311004395fd3a2b3b5c7cc
Author: Richard Hughes <richard hughsie com>
Date:   Tue Jul 20 09:58:55 2010 +0100

    trivial: remove some debugging that crept in

 src/gcm-calibrate-argyll.c |   11 ++---------
 src/gcm-calibrate-dialog.c |    6 ++++--
 2 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/src/gcm-calibrate-argyll.c b/src/gcm-calibrate-argyll.c
index 6ecccbe..52b13ea 100644
--- a/src/gcm-calibrate-argyll.c
+++ b/src/gcm-calibrate-argyll.c
@@ -1462,7 +1462,6 @@ gcm_calibrate_argyll_spotread_read_chart (GcmCalibrateArgyll *calibrate_argyll,
 	/* get correct name of the command */
 	command = gcm_calibrate_argyll_get_tool_filename ("spotread", error);
 	if (command == NULL) {
-		egg_error ("moo");
 		ret = FALSE;
 		goto out;
 	}
@@ -1495,10 +1494,8 @@ gcm_calibrate_argyll_spotread_read_chart (GcmCalibrateArgyll *calibrate_argyll,
 
 	/* start up the command */
 	ret = gcm_calibrate_argyll_fork_command (calibrate_argyll, argv, error);
-	if (!ret) {
-		egg_error ("moo");
+	if (!ret)
 		goto out;
-	}
 
 	/* wait until finished */
 	g_main_loop_run (priv->loop);
@@ -1510,7 +1507,6 @@ gcm_calibrate_argyll_spotread_read_chart (GcmCalibrateArgyll *calibrate_argyll,
 				     GCM_CALIBRATE_ERROR_USER_ABORT,
 				     "calibration was cancelled");
 		ret = FALSE;
-		egg_error ("moo");
 		goto out;
 	}
 #ifdef HAVE_VTE
@@ -1523,7 +1519,6 @@ gcm_calibrate_argyll_spotread_read_chart (GcmCalibrateArgyll *calibrate_argyll,
 			     "command failed to run successfully: %s", vte_text);
 		g_free (vte_text);
 		ret = FALSE;
-		egg_error ("moo");
 		goto out;
 	}
 #endif
@@ -1551,10 +1546,8 @@ gcm_calibrate_argyll_spotread (GcmCalibrate *calibrate, GtkWindow *window, GErro
 
 	/* step 3 */
 	ret = gcm_calibrate_argyll_spotread_read_chart (calibrate_argyll, error);
-	if (!ret) {
-		egg_error ("moo");
+	if (!ret)
 		goto out;
-	}
 
 	/* step 5 */
 	ret = gcm_calibrate_argyll_remove_temp_files (calibrate_argyll, error);
diff --git a/src/gcm-calibrate-dialog.c b/src/gcm-calibrate-dialog.c
index 9a778de..1281b2f 100644
--- a/src/gcm-calibrate-dialog.c
+++ b/src/gcm-calibrate-dialog.c
@@ -311,8 +311,10 @@ gcm_calibrate_dialog_get_window (GcmCalibrateDialog *calibrate_dialog)
 GtkResponseType
 gcm_calibrate_dialog_run (GcmCalibrateDialog *calibrate_dialog)
 {
-	if (g_main_loop_is_running (calibrate_dialog->priv->loop))
-		egg_error ("you can't call this recursively");
+	if (g_main_loop_is_running (calibrate_dialog->priv->loop)) {
+		egg_warning ("you can't call this recursively");
+		return GTK_RESPONSE_NONE;
+	}
 
 	g_main_loop_run (calibrate_dialog->priv->loop);
 	return calibrate_dialog->priv->response;



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