Updating branch refs/heads/master to 5a34db47a3b3af6f092dc37b1b7125abcc996736 (commit) from 79ab94111bf4a5508f0f9c47544075402b9f1890 (commit)
commit 5a34db47a3b3af6f092dc37b1b7125abcc996736 Author: Nick Schermer <n...@xfce.org> Date: Thu Apr 19 21:11:31 2012 +0200 Use other variable name. xfce4-session/xfsm-startup.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c index b4fa780..d5b54e8 100644 --- a/xfce4-session/xfsm-startup.c +++ b/xfce4-session/xfsm-startup.c @@ -95,22 +95,22 @@ static void xfsm_startup_init_sshagent (const gchar *cmd, const gchar *agent) { - gchar *stdout = NULL; + gchar *cmdoutput = NULL; GError *error = NULL; gchar **lines; guint i; gchar *p, *t; gchar *variable, *value; - if (g_spawn_command_line_sync (cmd, &stdout, NULL, NULL, &error)) + if (g_spawn_command_line_sync (cmd, &cmdoutput, NULL, NULL, &error)) { - if (G_UNLIKELY (stdout == NULL)) + if (G_UNLIKELY (cmdoutput == NULL)) { g_message ("%s returned no variables to stdout", agent); return; } - lines = g_strsplit (stdout, "\n", -1); + lines = g_strsplit (cmdoutput, "\n", -1); g_assert (lines != NULL); for (i = 0; lines[i] != NULL; i++) { @@ -140,7 +140,7 @@ xfsm_startup_init_sshagent (const gchar *cmd, g_error_free (error); } - g_free (stdout); + g_free (cmdoutput); } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits