pidgin: ae36b408: *** Plucked rev 0e263caa5d687101e436029f...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: ae36b4083bc8f72f21e331acfb95192e282f1e8f
Ancestor: cde34c1e1275ef33af880e0d29dda3ca7ba42a37
Author: darkrain42 at pidgin.im
Date: 2010-05-01T21:40:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ae36b4083bc8f72f21e331acfb95192e282f1e8f

Modified files:
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

*** Plucked rev 0e263caa5d687101e436029f2f8d09053ae06e23 (ivan.komarov at soc.pidgin.im):
\"View Web Profile\" link now leads to the correct link for ICQ accounts (Refs #9890).


-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	23ee7e0f130aab4bc97ce397ac8c3f727badd1c6
+++ libpurple/protocols/oscar/oscar.c	ec79d8d9fcba376be091b363977e8f23c748eff2
@@ -3534,7 +3534,7 @@ static int purple_parse_userinfo(OscarDa
 	PurpleConnection *gc = od->gc;
 	PurpleAccount *account = purple_connection_get_account(gc);
 	PurpleNotifyUserInfo *user_info;
-	gchar *tmp = NULL, *info_utf8 = NULL;
+	gchar *tmp = NULL, *info_utf8 = NULL, *base_profile_url = NULL;
 	va_list ap;
 	aim_userinfo_t *userinfo;
 
@@ -3587,8 +3587,9 @@ static int purple_parse_userinfo(OscarDa
 	}
 
 	purple_notify_user_info_add_section_break(user_info);
-	tmp = g_strdup_printf("<a href=\"http://profiles.aim.com/%s\">%s</a>",
-			purple_normalize(account, userinfo->bn), _("View web profile"));
+	base_profile_url = oscar_util_valid_name_icq(userinfo->bn) ? "http://www.icq.com/people" : "http://profiles.aim.com";
+	tmp = g_strdup_printf("<a href=\"%s/%s\">%s</a>",
+			base_profile_url, purple_normalize(account, userinfo->bn), _("View web profile"));
 	purple_notify_user_info_add_pair(user_info, NULL, tmp);
 	g_free(tmp);