diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-03-19 21:33:13 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-03-19 21:33:13 +0800 |
| commit | a2aba24221e2a461708f107b91a7f2f72363e509 (patch) | |
| tree | fdc87f1ebb84eea02e8293c254fcb04b97779070 /devel/anjuta/files/patch-libanjuta_anjuta-launcher.c | |
| parent | fbc5a8af7166c0968564d6b7c31a6ae66c0567c6 (diff) | |
| download | marcuscom-ports-a2aba24221e2a461708f107b91a7f2f72363e509.tar marcuscom-ports-a2aba24221e2a461708f107b91a7f2f72363e509.tar.gz marcuscom-ports-a2aba24221e2a461708f107b91a7f2f72363e509.tar.bz2 marcuscom-ports-a2aba24221e2a461708f107b91a7f2f72363e509.tar.lz marcuscom-ports-a2aba24221e2a461708f107b91a7f2f72363e509.tar.xz marcuscom-ports-a2aba24221e2a461708f107b91a7f2f72363e509.tar.zst marcuscom-ports-a2aba24221e2a461708f107b91a7f2f72363e509.zip | |
Clean up more merged ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17233 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, 0 insertions, 76 deletions
diff --git a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c deleted file mode 100644 index 126c7d9e3..000000000 --- a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c +++ /dev/null @@ -1,76 +0,0 @@ ---- 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)); |