diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-06-07 15:22:12 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-06-07 15:22:12 +0800 |
commit | 06091bc5039571362b7e7cf34a14085923a9134e (patch) | |
tree | bc23f98dd8a3e25d90ef3652d53117c824ac9a9b /devel/anjuta/files/patch-libanjuta_anjuta-launcher.c | |
parent | 6ae78cfbd6453237b008472e425796d0e7adf9ac (diff) | |
download | marcuscom-ports-06091bc5039571362b7e7cf34a14085923a9134e.tar marcuscom-ports-06091bc5039571362b7e7cf34a14085923a9134e.tar.gz marcuscom-ports-06091bc5039571362b7e7cf34a14085923a9134e.tar.bz2 marcuscom-ports-06091bc5039571362b7e7cf34a14085923a9134e.tar.lz marcuscom-ports-06091bc5039571362b7e7cf34a14085923a9134e.tar.xz marcuscom-ports-06091bc5039571362b7e7cf34a14085923a9134e.tar.zst marcuscom-ports-06091bc5039571362b7e7cf34a14085923a9134e.zip |
Update to 2.31.2.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14200 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/anjuta/files/patch-libanjuta_anjuta-launcher.c')
-rw-r--r-- | devel/anjuta/files/patch-libanjuta_anjuta-launcher.c | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c new file mode 100644 index 000000000..126c7d9e3 --- /dev/null +++ b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c @@ -0,0 +1,76 @@ +--- libanjuta/anjuta-launcher.c.orig 2009-03-18 04:24:10.000000000 -0400 ++++ libanjuta/anjuta-launcher.c 2009-04-16 19:49:25.000000000 -0400 +@@ -761,7 +761,8 @@ anjuta_launcher_scan_output (GIOChannel + GError *err = NULL; + do + { +- g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); ++ GIOStatus status; ++ status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); + if (n > 0) /* There is output */ + { + gchar *utf8_chars = NULL; +@@ -789,6 +790,15 @@ anjuta_launcher_scan_output (GIOChannel + anjuta_launcher_synchronize (launcher); + ret = FALSE; + } ++ else if (status == G_IO_STATUS_EOF) ++ { ++ launcher->priv->stdout_is_done = TRUE; ++ anjuta_launcher_synchronize (launcher); ++ if (err) ++ g_error_free (err); ++ return FALSE; ++ } ++ + /* Read next chars if buffer was too small + * (the maximum length of one character is 6 bytes) */ + } while (!err && (n > FILE_BUFFER_SIZE - 7)); +@@ -818,7 +828,8 @@ anjuta_launcher_scan_error (GIOChannel * + GError *err = NULL; + do + { +- g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); ++ GIOStatus status; ++ status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); + if (n > 0) /* There is stderr output */ + { + gchar *utf8_chars; +@@ -844,6 +855,15 @@ anjuta_launcher_scan_error (GIOChannel * + anjuta_launcher_synchronize (launcher); + ret = FALSE; + } ++ else if (status == G_IO_STATUS_EOF) ++ { ++ launcher->priv->stderr_is_done = TRUE; ++ anjuta_launcher_synchronize (launcher); ++ if (err) ++ g_error_free (err); ++ return FALSE; ++ } ++ + /* Read next chars if buffer was too small + * (the maximum length of one character is 6 bytes) */ + } while (!err && (n > FILE_BUFFER_SIZE - 7)); +@@ -873,7 +893,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch + GError *err = NULL; + do + { +- g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); ++ GIOStatus status; ++ status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); + if (n > 0) /* There is stderr output */ + { + gchar *utf8_chars; +@@ -902,6 +923,11 @@ anjuta_launcher_scan_pty (GIOChannel *ch + { + ret = FALSE; + } ++ else if (status == G_IO_STATUS_EOF) ++ { ++ ret = FALSE; ++ break; ++ } + /* Read next chars if buffer was too small + * (the maximum length of one character is 6 bytes) */ + } while (!err && (n > FILE_BUFFER_SIZE - 7)); |