applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #349079

Browse source 
2006-09-15  Matt Keenan <matt.keenan@sun.com>

	Fixes #349079

	* gnome-about-me-password.c (spawn_passwd): don't use stdin, stdout
	and stderr as variable names. Fixes compilation issue on Sun Studio
	compiler.
This commit is contained in:
Matt Keenan 2006-09-15 11:14:30 +00:00 • committed by Rodrigo Moya
parent f21f40313f
commit 83c92004ca
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
capplets/about-me/ChangeLog
View file

@ -1,3 +1,11 @@
2006-09-15 Matt Keenan <matt.keenan@sun.com>
Fixes #349079
* gnome-about-me-password.c (spawn_passwd): don't use stdin, stdout
and stderr as variable names. Fixes compilation issue on Sun Studio
compiler.
2006-08-07 Sebastien Bacher <seb128@debian.org>
* gnome-about-me.c: (about_me_load_photo), (about_me_update_photo):

14
capplets/about-me/gnome-about-me-password.c
View file

@ -183,7 +183,7 @@ spawn_passwd (PasswordDialog *pdialog, GError **error)
{
gchar *argv[2];
gchar *envp[1];
gint stdin, stdout, stderr;
gint my_stdin, my_stdout, my_stderr;
argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */
argv[1] = NULL;
@ -204,9 +204,9 @@ spawn_passwd (PasswordDialog *pdialog, GError **error)
NULL, /* Child setup */
NULL, /* Data to child setup */
&pdialog->backend_pid, /* PID */
&stdin, /* Stdin */
&stdout, /* Stdout */
&stderr, /* Stderr */
&my_stdin, /* Stdin */
&my_stdout, /* Stdout */
&my_stderr, /* Stderr */
error)) { /* GError */
/* An error occured */
@ -216,7 +216,7 @@ spawn_passwd (PasswordDialog *pdialog, GError **error)
}
/* 2>&1 */
if (dup2 (stderr, stdout) == -1) {
if (dup2 (my_stderr, my_stdout) == -1) {
/* Failed! */
g_set_error (error,
PASSDLG_ERROR,
@ -230,8 +230,8 @@ spawn_passwd (PasswordDialog *pdialog, GError **error)
}
/* Open IO Channels */
pdialog->backend_stdin = g_io_channel_unix_new (stdin);
pdialog->backend_stdout = g_io_channel_unix_new (stdout);
pdialog->backend_stdin = g_io_channel_unix_new (my_stdin);
pdialog->backend_stdout = g_io_channel_unix_new (my_stdout);
/* Set raw encoding */
/* Set nonblocking mode */