# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1308970068 0
# Node ID a99a4f9b7171c426cb9f3d856e45bdec9a9d05ab
# Parent  54a700cedb38f6568f160bb4981d36ba16ce2198# Parent  4f1bd59cb90ab99ad3a9e9aeefc41a6b9a6b6625
merge of '2cabccedebb0366f69f7d3e9c3e16e2f4c6b3aae'
     and '964dd46e688370c356b8c9f20a929290f4a00e6d'

diff -r 54a700cedb38 -r a99a4f9b7171 libpurple/protocols/jabber/jabber.c
--- 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,