diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2015-09-04 10:43:19 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2015-09-04 10:43:19 +0000 |
| commit | 68184f247f97dd3f8f91d05888dbb7d399f9788e (patch) | |
| tree | d3a665d7053a7402b9717a84f61a49acb4eba379 /net/gnome-nettool/files/patch-src_nettool.c | |
| parent | Update uhttpmock to 0.5.0. (diff) | |
Update gnome-nettool to 3.8.1.
Diffstat (limited to 'net/gnome-nettool/files/patch-src_nettool.c')
| -rw-r--r-- | net/gnome-nettool/files/patch-src_nettool.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/net/gnome-nettool/files/patch-src_nettool.c b/net/gnome-nettool/files/patch-src_nettool.c index 40e45446775a..05fa09223019 100644 --- a/net/gnome-nettool/files/patch-src_nettool.c +++ b/net/gnome-nettool/files/patch-src_nettool.c @@ -1,14 +1,14 @@ ---- src/nettool.c.orig 2009-06-18 13:51:14.000000000 -0400 -+++ src/nettool.c 2009-07-19 16:05:59.000000000 -0400 -@@ -24,6 +24,7 @@ +--- src/nettool.c.orig 2012-01-03 10:38:09.000000000 +0100 ++++ src/nettool.c 2015-08-28 16:28:52.904785000 +0200 +@@ -28,7 +28,6 @@ #include <string.h> #include <sys/types.h> #include <sys/socket.h> -+#include <netinet/in.h> +-#include <netinet/in.h> #include <signal.h> #include <errno.h> #include <sys/wait.h> -@@ -374,6 +375,10 @@ netinfo_io_text_buffer_dialog (GIOChanne +@@ -410,6 +409,10 @@ netinfo_io_text_buffer_dialog (GIOChanne len, NULL); } @@ -19,16 +19,19 @@ } else if (status == G_IO_STATUS_AGAIN) { char buf[1]; -@@ -385,6 +390,8 @@ netinfo_io_text_buffer_dialog (GIOChanne +@@ -421,6 +424,11 @@ netinfo_io_text_buffer_dialog (GIOChanne } g_string_append_c (netinfo->command_output, buf[0]); } ++ + g_free (text); ++ + return TRUE; ++ } else if (status == G_IO_STATUS_EOF) { } else if (status == G_IO_STATUS_ERROR) { -@@ -402,15 +409,15 @@ netinfo_io_text_buffer_dialog (GIOChanne +@@ -438,15 +446,16 @@ netinfo_io_text_buffer_dialog (GIOChanne } else { g_warning ("Error: %s\n", err->message); @@ -36,14 +39,15 @@ g_free (err); } -+ g_free (text); -+ return TRUE; -+ - } - - g_free (text); +- } - -- return TRUE; + g_free (text); + + return TRUE; ++ ++ } ++ ++ g_free (text); } /* The condition is not G_IO_HUP | G_IO_ERR | G_IO_NVAL, so |