# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1192942571 0
# Node ID 3f57415f5b8ba43763ce77b2bc042ba26aacad06
# Parent  01101467094f01b5658e546e5a784866039b34fd
applied changes from 5473bd4fec59a55c8ad482c92cc518fea564a241
             through 2859800860a726be81d3a19e19a5138521211b27

applied changes from 4c59953fd39724c7b48e897585df61dab901c4d2
             through e82ae16ed445d6896fec536a492fcc17bc6098e4

diff -r 01101467094f -r 3f57415f5b8b libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Sun Oct 21 04:54:43 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sun Oct 21 04:56:11 2007 +0000
@@ -1801,7 +1801,7 @@
 
 	if (have_status_message)
 	{
-		if ((status_id == OSCAR_STATUS_ID_AVAILABLE) && (info->itmsurl != NULL))
+		if ((!strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE)) && (info->itmsurl != NULL))
 		{
 			char *itmsurl;
 			itmsurl = oscar_encoding_to_utf8(account, info->itmsurl_encoding,
diff -r 01101467094f -r 3f57415f5b8b libpurple/util.c
--- a/libpurple/util.c	Sun Oct 21 04:54:43 2007 +0000
+++ b/libpurple/util.c	Sun Oct 21 04:56:11 2007 +0000
@@ -3510,7 +3510,7 @@
 	gboolean full;
 	int len;
 
-	if ((s = g_strstr_len(data, data_len, "Location: ")) == NULL)
+	if ((s = g_strstr_len(data, data_len, "\nLocation: ")) == NULL)
 		/* We're not being redirected */
 		return FALSE;