diff options
| author | Luke Schierer <lschiere@pidgin.im> | 2007-10-21 04:56:11 +0000 |
|---|---|---|
| committer | Luke Schierer <lschiere@pidgin.im> | 2007-10-21 04:56:11 +0000 |
| commit | 909f1f35675fd1bb7e03dab047ca24f9993ea1a4 (patch) | |
| tree | 7df061d2516af2463cbf92f6da00ceaee25e3df9 | |
| parent | 0035c916f594db76e41659222ea2ba0cb40b664d (diff) | |
| download | pidgin-909f1f35675fd1bb7e03dab047ca24f9993ea1a4.tar.gz | |
applied changes from 5473bd4fec59a55c8ad482c92cc518fea564a241
through 2859800860a726be81d3a19e19a5138521211b27
applied changes from 4c59953fd39724c7b48e897585df61dab901c4d2
through e82ae16ed445d6896fec536a492fcc17bc6098e4
| -rw-r--r-- | libpurple/protocols/oscar/oscar.c | 2 | ||||
| -rw-r--r-- | libpurple/util.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c index 1bb284327c..9ca65a76ae 100644 --- a/libpurple/protocols/oscar/oscar.c +++ b/libpurple/protocols/oscar/oscar.c @@ -1801,7 +1801,7 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame 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 --git a/libpurple/util.c b/libpurple/util.c index eb2c494b8e..f205efeb24 100644 --- a/libpurple/util.c +++ b/libpurple/util.c @@ -3510,7 +3510,7 @@ parse_redirect(const char *data, size_t data_len, gint sock, 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; |