# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1246670181 0
# Node ID 660cf341992fcd2ba4e220dcf596cd9b3659852d
# Parent  fe242dec0d50e597d0598855a3403e83db97fb93# Parent  6aa7772c4cc1ec8203252a95c2771e4fb1c920e1
merge of 'b6e009fb9284f653ac58c5309b5443eec6f12c8e'
     and 'dbb1a72f8c673c57a1b03e941c52cc371c73641e'

diff -r fe242dec0d50 -r 660cf341992f libpurple/util.c
--- a/libpurple/util.c	Sat Jul 04 01:07:26 2009 +0000
+++ b/libpurple/util.c	Sat Jul 04 01:16:21 2009 +0000
@@ -3797,7 +3797,7 @@
 	while (*s) {
 		/* Read the size of this chunk */
 		if (sscanf(s, "%" G_GSIZE_MODIFIER "x\r\n", &sz) != 1 &&
-			sscanf(s, "%" G_GSIZE_MODIFIER "x;\r\n", &sz) != 1)
+			sscanf(s, "%" G_GSIZE_MODIFIER "x;", &sz) != 1)
 		{
 			purple_debug_error("util", "Error processing chunked data: "
 					"Expected data length, found: %s\n", s);