Mercurial > pidgin
changeset 16339:2a575756340a
merge of 'ed8e54275ef886f687084411cbb9280b8a2e3111'
and 'fada40b291356ece697cf6bf0fff3e833ea736ad'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Tue, 24 Apr 2007 03:32:09 +0000 |
| parents | 2cf8383a806f (current diff) 1f50acd0e7e1 (diff) |
| children | bf353c85959a |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Tue Apr 24 02:51:53 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue Apr 24 03:32:09 2007 +0000 @@ -2898,7 +2898,7 @@ if (userinfo->status[0] != '\0') tmp = oscar_encoding_to_utf8(userinfo->status_encoding, userinfo->status, userinfo->status_len); -#ifdef _WIN32 +#if defined (_WIN32) || defined (__APPLE__) if (userinfo->itmsurl[0] != '\0') { gchar *itmsurl, *tmp2; itmsurl = oscar_encoding_to_utf8(userinfo->itmsurl_encoding,