Mercurial > pidgin
changeset 20355:3f57415f5b8b
applied changes from 5473bd4fec59a55c8ad482c92cc518fea564a241
through 2859800860a726be81d3a19e19a5138521211b27
applied changes from 4c59953fd39724c7b48e897585df61dab901c4d2
through e82ae16ed445d6896fec536a492fcc17bc6098e4
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sun, 21 Oct 2007 04:56:11 +0000 |
| parents | 01101467094f |
| children | b9d27d1f2e60 |
| files | libpurple/protocols/oscar/oscar.c libpurple/util.c |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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,
--- 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;