--- contrib/session-helper/cd-main.c.orig Tue Mar 5 08:39:52 2013 +++ contrib/session-helper/cd-main.c Tue Mar 5 08:40:18 2013 @@ -1123,7 +1123,7 @@ cd_main_generate_profile (CdMainPrivate *priv, GError { gboolean ret; gchar *command; - gchar *stderr = NULL; + gchar *cd_stderr = NULL; gint exit_status = 0; gchar *cmd_debug = NULL; GPtrArray *array = NULL; @@ -1159,7 +1159,7 @@ cd_main_generate_profile (CdMainPrivate *priv, GError 0, NULL, NULL, NULL, - &stderr, + &cd_stderr, &exit_status, error); if (!ret) @@ -1169,14 +1169,14 @@ cd_main_generate_profile (CdMainPrivate *priv, GError g_set_error (error, CD_SESSION_ERROR, CD_SESSION_ERROR_FAILED_TO_GENERATE_PROFILE, - "colprof failed: %s", stderr); + "colprof failed: %s", cd_stderr); goto out; } out: if (array != NULL) g_ptr_array_unref (array); g_free (command); - g_free (stderr); + g_free (cd_stderr); g_free (cmd_debug); return ret; }