Mercurial > pidgin
changeset 25909:4e9f98939d32
merge of '55fb011e6060667ce31490ccd4621350fb8e90c6'
and 'e3884dce703733ce2450cbe9d41ba82e90e5582d'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 24 Jan 2009 03:11:04 +0000 |
| parents | 8958393be615 (current diff) 3687049b4faf (diff) |
| children | 3d8c53f3108e |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)
--- 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; }