# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1177385529 0
# Node ID 2a575756340a84e0efefa7f7fd003bc992834702
# Parent  2cf8383a806f7024e6fff4e440a3280460de716c# Parent  1f50acd0e7e169bda04dd75bd84ab37faf333d31
merge of 'ed8e54275ef886f687084411cbb9280b8a2e3111'
     and 'fada40b291356ece697cf6bf0fff3e833ea736ad'

diff -r 2cf8383a806f -r 2a575756340a libpurple/protocols/oscar/oscar.c
--- 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,