diff options
Diffstat (limited to 'x11/gdm/files/extra-patch-daemon_slave.c')
| -rw-r--r-- | x11/gdm/files/extra-patch-daemon_slave.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c index 2d609cf2faec..b493dcd80ad9 100644 --- a/x11/gdm/files/extra-patch-daemon_slave.c +++ b/x11/gdm/files/extra-patch-daemon_slave.c @@ -1,6 +1,6 @@ ---- daemon/slave.c.orig Sat Oct 28 22:38:51 2006 -+++ daemon/slave.c Tue Oct 31 12:33:41 2006 -@@ -321,8 +321,7 @@ run_session_output (gboolean read_until_ +--- daemon/slave.c.orig 2007-09-17 10:45:50.000000000 -0400 ++++ daemon/slave.c 2007-09-25 13:42:06.000000000 -0400 +@@ -373,8 +373,7 @@ break; } @@ -10,17 +10,17 @@ continue; /* write until we succeed in writing something */ -@@ -344,13 +343,6 @@ run_session_output (gboolean read_until_ - } +@@ -397,13 +396,6 @@ d->xsession_errors_bytes += r; -- + - if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES && - ! got_xfsz_signal) { - VE_IGNORE_EINTR (write (d->xsession_errors_fd, -- "\n...Too much output, ignoring rest...\n", -- strlen ("\n...Too much output, ignoring rest...\n"))); +- "\n...Too much output, ignoring rest...\n", +- strlen ("\n...Too much output, ignoring rest...\n"))); - } - +- /* there wasn't more then buf available, so no need to try reading * again, unless we really want to */ + if (r < sizeof (buf) && ! read_until_eof) |