SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into wdk

This commit is contained in:
Berke Viktor 2012-01-08 23:57:46 +01:00
parent 18404054b0 bca7e6c554
commit 34dace46af
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/outbound.c
View File

@ -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 */

2
src/common/servlist.c
View File

@ -27,7 +27,7 @@
#endif
#include "xchat.h"
#include <glib/ghash.h>
#include <glib.h>
#include "cfgfiles.h"
#include "fe.h"

2
src/common/text.c
View File

@ -31,7 +31,7 @@
#endif
#include "xchat.h"
#include <glib/ghash.h>
#include <glib.h>
#include "cfgfiles.h"
#include "chanopt.h"
#include "plugin.h"

2
src/common/util.c
View File

@ -45,7 +45,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"

6
src/common/xchat.h
View File

@ -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