aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/oscar/oscar.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-01-24 12:28:13 +1300
committerJelmer Vernooij <jelmer@samba.org>2006-01-24 12:28:13 +1300
commit9fae35c9cf2d5a319623946705e5d7179ea5c338 (patch)
treec489bfe332588c4fb918b4759c3f89f8b4c0a75f /protocols/oscar/oscar.c
parent7308b63f3300d5b2a326edfde6c50a18bc05e3e5 (diff)
parent68c7c145c281fe3ae734b345bf133d70d1ef8652 (diff)
Merge from Wilmer
Diffstat (limited to 'protocols/oscar/oscar.c')
-rw-r--r--protocols/oscar/oscar.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c
index 5f19f12b..4e552bce 100644
--- a/protocols/oscar/oscar.c
+++ b/protocols/oscar/oscar.c
@@ -20,7 +20,6 @@
*
*/
-#include "sock.h"
#include <errno.h>
#include <ctype.h>
#include <string.h>
@@ -32,6 +31,7 @@
#include "nogaim.h"
#include "bitlbee.h"
#include "proxy.h"
+#include "sock.h"
#include "aim.h"
#include "icq.h"
@@ -607,6 +607,7 @@ static void damn_you(gpointer data, gint source, GaimInputCondition c)
g_free(pos);
return;
}
+ /* [WvG] Wheeeee! Who needs error checking anyway? ;-) */
read(pos->fd, m, 16);
m[16] = '\0';
gaim_input_remove(pos->inpa);