Mercurial > pidgin.yaz
diff libpurple/protocols/msnp9/userlist.c @ 21589:af5de2b08fe0
QuLogic submitted this patch a long time ago, References #2571. I believe
we need to do something for MSNP14 as well, but I haven't figured out
exactly what
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Mon, 19 Nov 2007 07:56:50 +0000 |
parents | fd101c75472f |
children | a7ef2c82d125 |
line wrap: on
line diff
--- a/libpurple/protocols/msnp9/userlist.c Mon Nov 19 07:44:51 2007 +0000 +++ b/libpurple/protocols/msnp9/userlist.c Mon Nov 19 07:56:50 2007 +0000 @@ -132,18 +132,18 @@ } static const char* -get_store_name(MsnUser *user) +get_friendly_name(MsnUser *user) { - const char *store_name; + const char *friendly_name; g_return_val_if_fail(user != NULL, NULL); - store_name = msn_user_get_store_name(user); + friendly_name = msn_user_get_friendly_name(user); - if (store_name != NULL) - store_name = purple_url_encode(store_name); + if (friendly_name != NULL) + friendly_name = purple_url_encode(friendly_name); else - store_name = msn_user_get_passport(user); + friendly_name = msn_user_get_passport(user); /* this might be a bit of a hack, but it should prevent notification server * disconnections for people who have buddies with insane friendly names @@ -153,10 +153,10 @@ /* Stu: yeah, that's why it's a bit of a hack, as you pointed out, we're * probably decoding the incoming store_name wrong, or something. bleh. */ - if (strlen(store_name) > BUDDY_ALIAS_MAXLEN) - store_name = msn_user_get_passport(user); + if (strlen(friendly_name) > BUDDY_ALIAS_MAXLEN) + friendly_name = msn_user_get_passport(user); - return store_name; + return friendly_name; } static void @@ -360,7 +360,7 @@ gc = purple_account_get_connection(account); passport = msn_user_get_passport(user); - store = msn_user_get_store_name(user); + store = msn_user_get_friendly_name(user); if (list_op & MSN_LIST_FL_OP) { @@ -639,7 +639,7 @@ MsnUser *user; int group_id; const char *list; - const char *store_name; + const char *friendly_name; group_id = -1; @@ -681,13 +681,13 @@ return; } - store_name = (user != NULL) ? get_store_name(user) : who; + friendly_name = (user != NULL) ? get_friendly_name(user) : who; /* Then request the add to the server. */ list = lists[list_id]; msn_notification_add_buddy(userlist->session->notification, list, who, - store_name, group_id); + friendly_name, group_id); } void