im.pidgin.pidgin.2.2.2: 8a05b4d21a237acf2903a9ae46ba7c4e52fa3118

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: 8a05b4d21a237acf2903a9ae46ba7c4e52fa3118
Ancestor: 1d07824bc5fc88bc95f6b43ff93a75f8d5c8ded0
Author: lschiere at pidgin.im
Date: 2007-10-21T04:56:11
Branch: im.pidgin.pidgin.2.2.2

Modified files:
        libpurple/protocols/oscar/oscar.c libpurple/util.c

ChangeLog: 

applied changes from 5473bd4fec59a55c8ad482c92cc518fea564a241
             through 2859800860a726be81d3a19e19a5138521211b27

applied changes from 4c59953fd39724c7b48e897585df61dab901c4d2
             through e82ae16ed445d6896fec536a492fcc17bc6098e4

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	6f7b169436ff9d9d351d75c4fade61a6e2958902
+++ libpurple/protocols/oscar/oscar.c	6f4eb1209665fcba2b468360230a6213277e6dd6
@@ -1801,7 +1801,7 @@ static int purple_parse_oncoming(OscarDa
 
 	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,
============================================================
--- libpurple/util.c	1348846bb0c02a628509cdb73b39f739c1eb3110
+++ libpurple/util.c	9420c927f92bd71eb0b20230bbcb3be416f3ffcf
@@ -3510,7 +3510,7 @@ parse_redirect(const char *data, size_t 
 	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;