summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2007-09-26 01:44:28 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2007-09-26 01:44:28 +0800
commitba3c9756147c762f1df3f379d28cad2ff1411646 (patch)
tree65e0cc8a07ee62d131e9da1b15840266c5694250 /x11
parent8717af9f4a7210d601f8e2dd6ef34ed571e58d49 (diff)
downloadmarcuscom-ports-ba3c9756147c762f1df3f379d28cad2ff1411646.tar
marcuscom-ports-ba3c9756147c762f1df3f379d28cad2ff1411646.tar.gz
marcuscom-ports-ba3c9756147c762f1df3f379d28cad2ff1411646.tar.bz2
marcuscom-ports-ba3c9756147c762f1df3f379d28cad2ff1411646.tar.lz
marcuscom-ports-ba3c9756147c762f1df3f379d28cad2ff1411646.tar.xz
marcuscom-ports-ba3c9756147c762f1df3f379d28cad2ff1411646.tar.zst
marcuscom-ports-ba3c9756147c762f1df3f379d28cad2ff1411646.zip
Update patch
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9706 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
-rw-r--r--x11/gdm/files/extra-patch-daemon_slave.c18
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 2d609cf2f..b493dcd80 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)