changeset 32161:a99a4f9b7171

merge of '2cabccedebb0366f69f7d3e9c3e16e2f4c6b3aae' and '964dd46e688370c356b8c9f20a929290f4a00e6d'
author Paul Aurich <paul@darkrain42.org>
date Sat, 25 Jun 2011 02:47:48 +0000
parents 54a700cedb38 (current diff) 4f1bd59cb90a (diff)
children accce7b79737 910e966d18b3
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c	Sat Jun 25 02:42:08 2011 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Jun 25 02:47:48 2011 +0000
@@ -579,7 +579,7 @@
 	 */
 
 	jabber_send_raw(js, buf, len);
-	return len;
+	return (len < 0 ? strlen(buf) : len);
 }
 
 void jabber_send_signal_cb(PurpleConnection *pc, xmlnode **packet,