NetworkAgent: use g_close() instead of GUnixInputStream

We created the input stream just to close the FD, but GLib has
a handy close() wrapper, so we can use that instead.

https://bugzilla.gnome.org/show_bug.cgi?id=707269
This commit is contained in:
Giovanni Campagna 2013-09-02 09:59:01 +02:00
parent 937d064860
commit a27b44a3c2

View File

@ -380,11 +380,7 @@ const VPNRequestHandler = new Lang.Class({
this._childPid = pid; this._childPid = pid;
this._stdin = new Gio.UnixOutputStream({ fd: stdin, close_fd: true }); this._stdin = new Gio.UnixOutputStream({ fd: stdin, close_fd: true });
this._stdout = new Gio.UnixInputStream({ fd: stdout, close_fd: true }); this._stdout = new Gio.UnixInputStream({ fd: stdout, close_fd: true });
// We need this one too, even if don't actually care of what the process GLib.close(stderr);
// has to say on stderr, because otherwise the fd opened by g_spawn_async_with_pipes
// is kept open indefinitely
let stderrStream = new Gio.UnixInputStream({ fd: stderr, close_fd: true });
stderrStream.close(null);
this._dataStdout = new Gio.DataInputStream({ base_stream: this._stdout }); this._dataStdout = new Gio.DataInputStream({ base_stream: this._stdout });
if (this._newStylePlugin) if (this._newStylePlugin)