Mercurial > pidgin
comparison libpurple/protocols/yahoo/yahoo_profile.c @ 25877:1260a3fb60f4
propagate from branch 'im.pidgin.pidgin' (head b8d6086aef6b2e65d86e8ce60220ab7f460d5079)
to branch 'im.pidgin.pidgin.next.minor' (head c165595260a2efa0ca23704ada46a303e0412e19)
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 12 Dec 2008 20:03:58 +0000 |
parents | 8aa7d8bcbc7d 9fc3f5bf4455 |
children | 510f07e1f5c1 |
comparison
equal
deleted
inserted
replaced
24710:d1d9d085d626 | 25877:1260a3fb60f4 |
---|---|
697 | 697 |
698 b = purple_find_buddy(purple_connection_get_account(info_data->gc), | 698 b = purple_find_buddy(purple_connection_get_account(info_data->gc), |
699 info_data->name); | 699 info_data->name); |
700 | 700 |
701 if (b) { | 701 if (b) { |
702 if(b->alias && b->alias[0]) { | 702 const char *balias = purple_buddy_get_local_buddy_alias(b); |
703 char *aliastext = g_markup_escape_text(b->alias, -1); | 703 if(balias && balias[0]) { |
704 char *aliastext = g_markup_escape_text(balias, -1); | |
704 purple_notify_user_info_add_pair(user_info, _("Alias"), aliastext); | 705 purple_notify_user_info_add_pair(user_info, _("Alias"), aliastext); |
705 g_free(aliastext); | 706 g_free(aliastext); |
706 } | 707 } |
707 #if 0 | 708 #if 0 |
708 if (b->idle > 0) { | 709 if (b->idle > 0) { |
713 #endif | 714 #endif |
714 | 715 |
715 /* Add the normal tooltip pairs */ | 716 /* Add the normal tooltip pairs */ |
716 yahoo_tooltip_text(b, user_info, TRUE); | 717 yahoo_tooltip_text(b, user_info, TRUE); |
717 | 718 |
718 if ((f = yahoo_friend_find(info_data->gc, b->name))) { | 719 if ((f = yahoo_friend_find(info_data->gc, purple_buddy_get_name(b)))) { |
719 const char *ip; | 720 const char *ip; |
720 if ((ip = yahoo_friend_get_ip(f))) | 721 if ((ip = yahoo_friend_get_ip(f))) |
721 purple_notify_user_info_add_pair(user_info, _("IP Address"), ip); | 722 purple_notify_user_info_add_pair(user_info, _("IP Address"), ip); |
722 } | 723 } |
723 } | 724 } |
1211 if (b) { | 1212 if (b) { |
1212 /* Someone on the buddy list can be "not on server list", | 1213 /* Someone on the buddy list can be "not on server list", |
1213 * in which case the user may or may not actually exist. | 1214 * in which case the user may or may not actually exist. |
1214 * Hence this extra step. | 1215 * Hence this extra step. |
1215 */ | 1216 */ |
1216 f = yahoo_friend_find(b->account->gc, b->name); | 1217 PurpleAccount *account = purple_buddy_get_account(b); |
1218 f = yahoo_friend_find(purple_account_get_connection(account), | |
1219 purple_buddy_get_name(b)); | |
1217 } | 1220 } |
1218 str = f ? _("Could not retrieve the user's profile. " | 1221 str = f ? _("Could not retrieve the user's profile. " |
1219 "This most likely is a temporary server-side problem. " | 1222 "This most likely is a temporary server-side problem. " |
1220 "Please try again later.") : | 1223 "Please try again later.") : |
1221 _("Could not retrieve the user's profile. " | 1224 _("Could not retrieve the user's profile. " |