diff options
| author | Berke Viktor <berkeviktor@aol.com> | 2012-01-08 23:48:46 +0100 |
|---|---|---|
| committer | Berke Viktor <berkeviktor@aol.com> | 2012-01-08 23:48:46 +0100 |
| commit | bca7e6c554fe2406004c25056160950a276208f7 (patch) | |
| tree | affce10d5ffb06674f2208493591112526cbb9ed /src/common | |
| parent | 774ff23920e1e2f3f2f23c7be3da27497c1b5df6 (diff) | |
update xchat to r1499
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/outbound.c | 2 | ||||
| -rw-r--r-- | src/common/servlist.c | 2 | ||||
| -rw-r--r-- | src/common/text.c | 2 | ||||
| -rw-r--r-- | src/common/util.c | 2 | ||||
| -rw-r--r-- | src/common/xchat.h | 6 |
5 files changed, 5 insertions, 9 deletions
diff --git a/src/common/outbound.c b/src/common/outbound.c index 7c6e5e6a..c1270e96 100644 --- a/src/common/outbound.c +++ b/src/common/outbound.c @@ -1716,7 +1716,7 @@ exec_data (GIOChannel *source, GIOCondition condition, struct nbexec *s) rest = buf; if (*rest) { s->buffill = len - (rest - buf); /* = strlen(rest) */ - s->linebuf = malloc(s->buffill); + s->linebuf = malloc(s->buffill + 1); memcpy(s->linebuf, rest, s->buffill); *rest = '\0'; len -= s->buffill; /* possibly 0 */ diff --git a/src/common/servlist.c b/src/common/servlist.c index 29731b14..66bc8115 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -24,7 +24,7 @@ #include <unistd.h> #include "xchat.h" -#include <glib/ghash.h> +#include <glib.h> #include "cfgfiles.h" #include "fe.h" diff --git a/src/common/text.c b/src/common/text.c index a2198517..6b111742 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -28,7 +28,7 @@ #include <sys/mman.h> #include "xchat.h" -#include <glib/ghash.h> +#include <glib.h> #include "cfgfiles.h" #include "chanopt.h" #include "plugin.h" diff --git a/src/common/util.c b/src/common/util.c index 49517ec4..5a0ab6c5 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -39,7 +39,7 @@ #include <errno.h> #include "xchat.h" #include "xchatc.h" -#include <glib/gmarkup.h> +#include <glib.h> #include <ctype.h> #include "util.h" #include "../../config.h" diff --git a/src/common/xchat.h b/src/common/xchat.h index db7a6c4b..10f1067e 100644 --- a/src/common/xchat.h +++ b/src/common/xchat.h @@ -1,10 +1,6 @@ #include "../../config.h" -#include <glib/gslist.h> -#include <glib/glist.h> -#include <glib/gutils.h> -#include <glib/giochannel.h> -#include <glib/gstrfuncs.h> +#include <glib.h> #include <time.h> /* need time_t */ #ifndef XCHAT_H |