[gnome-color-manager] trivial: fix a critical warning when we overwrite the parent window value on device calibration
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] trivial: fix a critical warning when we overwrite the parent window value on device calibration
- Date: Tue, 2 Mar 2010 10:20:05 +0000 (UTC)
commit 7325b986b4749d1bc260ff992a055e7edab60003
Author: Richard Hughes <richard hughsie com>
Date: Tue Mar 2 10:15:25 2010 +0000
trivial: fix a critical warning when we overwrite the parent window value on device calibration
src/gcm-calibrate.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/gcm-calibrate.c b/src/gcm-calibrate.c
index 9e36cf7..44f866c 100644
--- a/src/gcm-calibrate.c
+++ b/src/gcm-calibrate.c
@@ -847,6 +847,7 @@ gcm_calibrate_device (GcmCalibrate *calibrate, GtkWindow *window, GError **error
const gchar *directory;
GString *string;
GtkResponseType response;
+ GtkWindow *window_tmp;
#ifdef GCM_USE_PACKAGEKIT
GtkWidget *dialog;
#endif
@@ -940,8 +941,8 @@ gcm_calibrate_device (GcmCalibrate *calibrate, GtkWindow *window, GError **error
/* get scanned image */
directory = g_get_home_dir ();
- window = gcm_calibrate_dialog_get_window (priv->calibrate_dialog);
- reference_image = gcm_calibrate_device_get_reference_image (directory, window);
+ window_tmp = gcm_calibrate_dialog_get_window (priv->calibrate_dialog);
+ reference_image = gcm_calibrate_device_get_reference_image (directory, window_tmp);
if (reference_image == NULL) {
g_set_error_literal (error,
GCM_CALIBRATE_ERROR,
@@ -958,7 +959,7 @@ gcm_calibrate_device (GcmCalibrate *calibrate, GtkWindow *window, GError **error
/* get reference data */
directory = has_shared_targets ? "/usr/share/color/targets" : "/media";
- reference_data = gcm_calibrate_device_get_reference_data (directory, window);
+ reference_data = gcm_calibrate_device_get_reference_data (directory, window_tmp);
if (reference_data == NULL) {
g_set_error_literal (error,
GCM_CALIBRATE_ERROR,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]