summaryrefslogtreecommitdiff
path: root/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c
diff options
context:
space:
mode:
Diffstat (limited to 'devel/anjuta/files/patch-libanjuta_anjuta-launcher.c')
-rw-r--r--devel/anjuta/files/patch-libanjuta_anjuta-launcher.c29
1 files changed, 10 insertions, 19 deletions
diff --git a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c
index 1c7679ab2b95..0235ff1e8d24 100644
--- a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c
+++ b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c
@@ -1,15 +1,6 @@
---- libanjuta/anjuta-launcher.c.orig 2008-02-15 18:32:29.000000000 -0500
-+++ libanjuta/anjuta-launcher.c 2008-02-25 22:45:03.000000000 -0500
-@@ -37,7 +37,7 @@
- #include <signal.h>
-
- #if !defined(__sun) && !defined(__NetBSD__)
--# ifndef FREEBSD
-+# if !defined(__FreeBSD__)
- # include <pty.h>
- # else
- # include <libutil.h>
-@@ -749,7 +749,8 @@ anjuta_launcher_scan_output (GIOChannel
+--- libanjuta/anjuta-launcher.c.orig 2008-05-29 22:37:02.000000000 +0200
++++ libanjuta/anjuta-launcher.c 2008-06-05 16:12:17.000000000 +0200
+@@ -761,7 +761,8 @@ anjuta_launcher_scan_output (GIOChannel
GError *err = NULL;
do
{
@@ -18,8 +9,8 @@
+ status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err);
if (n > 0) /* There is output */
{
- gchar *utf8_chars;
-@@ -776,6 +777,13 @@ anjuta_launcher_scan_output (GIOChannel
+ gchar *utf8_chars = NULL;
+@@ -789,6 +790,13 @@ anjuta_launcher_scan_output (GIOChannel
anjuta_launcher_synchronize (launcher);
ret = FALSE;
}
@@ -33,7 +24,7 @@
/* Read next chars if buffer was too small
* (the maximum length of one character is 6 bytes) */
} while (!err && (n > FILE_BUFFER_SIZE - 7));
-@@ -805,7 +813,8 @@ anjuta_launcher_scan_error (GIOChannel *
+@@ -818,7 +826,8 @@ anjuta_launcher_scan_error (GIOChannel *
GError *err = NULL;
do
{
@@ -43,7 +34,7 @@
if (n > 0) /* There is stderr output */
{
gchar *utf8_chars;
-@@ -833,6 +842,13 @@ anjuta_launcher_scan_error (GIOChannel *
+@@ -844,6 +853,13 @@ anjuta_launcher_scan_error (GIOChannel *
anjuta_launcher_synchronize (launcher);
ret = FALSE;
}
@@ -57,7 +48,7 @@
/* Read next chars if buffer was too small
* (the maximum length of one character is 6 bytes) */
} while (!err && (n > FILE_BUFFER_SIZE - 7));
-@@ -862,7 +878,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch
+@@ -873,7 +889,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch
GError *err = NULL;
do
{
@@ -67,8 +58,8 @@
if (n > 0) /* There is stderr output */
{
gchar *utf8_chars;
-@@ -893,6 +910,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch
- g_warning ("pty: %s", err->message);
+@@ -902,6 +919,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch
+ {
ret = FALSE;
}
+ else if (status == G_IO_STATUS_EOF)