# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1232766664 0
# Node ID 4e9f98939d324a1c8cf1a2fab9abaea1b6e75f07
# Parent  8958393be6157927cf831dc37dd87dff6ece8e6e# Parent  3687049b4fafdbdd157685d1a739e7b1ad78aee3
merge of '55fb011e6060667ce31490ccd4621350fb8e90c6'
     and 'e3884dce703733ce2450cbe9d41ba82e90e5582d'

diff -r 8958393be615 -r 4e9f98939d32 COPYRIGHT
--- a/COPYRIGHT	Wed Jan 21 18:34:32 2009 +0000
+++ b/COPYRIGHT	Sat Jan 24 03:11:04 2009 +0000
@@ -211,6 +211,7 @@
 Jaromír Karmazín
 John Kelm
 Jochen Kemnade
+Yann Kerherve
 Akuke Kok
 Kir Kolyshkin
 Konstantin Korikov
diff -r 8958393be615 -r 4e9f98939d32 libpurple/protocols/jabber/auth.c
--- a/libpurple/protocols/jabber/auth.c	Wed Jan 21 18:34:32 2009 +0000
+++ b/libpurple/protocols/jabber/auth.c	Sat Jan 24 03:11:04 2009 +0000
@@ -749,8 +749,8 @@
 
 				val_end = cur;
 				while (val_end != val_start && (*val_end == ' ' || *val_end == ',' || *val_end == '\t'
-						|| *val_end == '\r' || *val_start == '\n'
-						|| *val_end == '"'))
+						|| *val_end == '\r' || *val_end == '\n'
+						|| *val_end == '"'  || *val_end == '\0'))
 					val_end--;
 
 				if (val_start != val_end)
diff -r 8958393be615 -r 4e9f98939d32 libpurple/protocols/jabber/buddy.c
--- a/libpurple/protocols/jabber/buddy.c	Wed Jan 21 18:34:32 2009 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Sat Jan 24 03:11:04 2009 +0000
@@ -2520,7 +2520,7 @@
 	JabberBuddyResource *jbr = jabber_buddy_find_resource((JabberBuddy*)jb, NULL);
 
 	if (!jbr) {
-		purple_debug_error("jabber",
+		purple_debug_info("jabber",
 			"Unable to find caps: buddy might be offline\n");
 		return FALSE;
 	}