changeset
merge of '2c3aa45bcd7c2b8419935f90818498266191e9bc'
Tue, 24 Apr 2007 03:37:14 +0000
- author
- William Ehlhardt <williamehlhardt@gmail.com>
- date
- Tue, 24 Apr 2007 03:37:14 +0000
- changeset 16434
- 13d46519ebd8
- parent 16433
- 2c3aa45bcd7c (current diff)
- parent 16432
- abc01f68aaee (diff)
- child 16435
- 5b8caa5c6249
merge of '2c3aa45bcd7c2b8419935f90818498266191e9bc'
and 'abc01f68aaee963e0003c6586921abdc03ab2edd'
committer: Evan Schoenberg <evands@pidgin.im>
--- a/libpurple/protocols/oscar/oscar.c Tue Apr 24 02:51:53 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue Apr 24 03:37:14 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,
