debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't use 'stdin' or 'stdout' as variable names

Browse source
This commit is contained in:
Brandon Mercer 2008-10-08 15:45:34 +02:00 committed by Christian Dywan
parent 9abfe87be9
commit 16e47a6a1f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
midori/midori-view.c
View file

@ -1512,8 +1512,8 @@ gtk_socket_realize_cb (GtkWidget* socket,
gchar* socket_id; gchar* socket_id;
GError* error; GError* error;
gboolean success; gboolean success;
gint stdin; gint stdin_fd;
gint stdout; gint stdout_fd;
gchar* argv[] = { NULL, "--id", NULL, NULL }; gchar* argv[] = { NULL, "--id", NULL, NULL };
/* Sockets are not supported on all platforms, /* Sockets are not supported on all platforms,
@ -1531,7 +1531,7 @@ gtk_socket_realize_cb (GtkWidget* socket,
error = NULL; error = NULL;
success = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, success = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, NULL, NULL, NULL,
&stdin, &stdout, NULL, &error); &stdin_fd, &stdout_fd, NULL, &error);
g_free (socket_id); g_free (socket_id);
if (!success) if (!success)
@ -1544,8 +1544,8 @@ gtk_socket_realize_cb (GtkWidget* socket,
return; return;
} }
view->output = fdopen (stdin, "w"); view->output = fdopen (stdin_fd, "w");
view->input = g_io_channel_unix_new (stdout); view->input = g_io_channel_unix_new (stdout_fd);
g_io_channel_set_close_on_unref (view->input, TRUE); g_io_channel_set_close_on_unref (view->input, TRUE);
g_io_add_watch (view->input, g_io_add_watch (view->input,
G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_NVAL | G_IO_HUP, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_NVAL | G_IO_HUP,