comparison libpurple/protocols/msn/userlist.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 8d562557ed6f 77873bca18bb
children ca01403251f1
comparison
equal deleted inserted replaced
24710:d1d9d085d626 25877:1260a3fb60f4
922 /*load userlist from the Blist file cache*/ 922 /*load userlist from the Blist file cache*/
923 void 923 void
924 msn_userlist_load(MsnSession *session) 924 msn_userlist_load(MsnSession *session)
925 { 925 {
926 PurpleBlistNode *gnode, *cnode, *bnode; 926 PurpleBlistNode *gnode, *cnode, *bnode;
927 PurpleConnection *gc = purple_account_get_connection(session->account); 927 PurpleAccount *account = session->account;
928 PurpleConnection *gc = purple_account_get_connection(account);
928 GSList *l; 929 GSList *l;
929 MsnUser * user; 930 MsnUser * user;
930 931
931 g_return_if_fail(gc != NULL); 932 g_return_if_fail(gc != NULL);
932 933
933 for (gnode = purple_get_blist()->root; gnode; gnode = gnode->next) 934 for (gnode = purple_blist_get_root(); gnode;
935 gnode = purple_blist_node_get_sibling_next(gnode))
934 { 936 {
935 if (!PURPLE_BLIST_NODE_IS_GROUP(gnode)) 937 if (!PURPLE_BLIST_NODE_IS_GROUP(gnode))
936 continue; 938 continue;
937 for (cnode = gnode->child; cnode; cnode = cnode->next) 939 for (cnode = purple_blist_node_get_first_child(gnode);
940 cnode;
941 cnode = purple_blist_node_get_sibling_next(cnode))
938 { 942 {
939 if (!PURPLE_BLIST_NODE_IS_CONTACT(cnode)) 943 if (!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
940 continue; 944 continue;
941 for (bnode = cnode->child; bnode; bnode = bnode->next) 945 for (bnode = purple_blist_node_get_first_child(cnode);
946 bnode;
947 bnode = purple_blist_node_get_sibling_next(bnode))
942 { 948 {
943 PurpleBuddy *b; 949 PurpleBuddy *b;
944 if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode)) 950 if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
945 continue; 951 continue;
946 b = (PurpleBuddy *)bnode; 952 b = (PurpleBuddy *)bnode;
947 if (b->account == gc->account) 953 if (purple_buddy_get_account(b) == account)
948 { 954 {
949 user = msn_userlist_find_add_user(session->userlist, 955 user = msn_userlist_find_add_user(session->userlist,
950 b->name,NULL); 956 purple_buddy_get_name(b), NULL);
951 b->proto_data = user; 957 purple_buddy_set_protocol_data(b, user);
952 msn_user_set_op(user, MSN_LIST_FL_OP); 958 msn_user_set_op(user, MSN_LIST_FL_OP);
953 } 959 }
954 } 960 }
955 } 961 }
956 } 962 }