Mercurial > pidgin

comparison libpurple/protocols/msn/user.c @ 32672:3828a61c44da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A boring and large patch so I can merge heads.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 23 Dec 2011 08:21:58 +0000
parents f60a5bec2a0d
children
comparison
equal deleted inserted replaced
32671:0e69949b3e61 32672:3828a61c44da
74 } 74 }
75 g_list_free(user->group_ids); 75 g_list_free(user->group_ids);
76 } 76 }
77 77
78 if (user->msnobj != NULL) 78 if (user->msnobj != NULL)
79 msn_object_destroy(user->msnobj); 79 msn_object_destroy(user->msnobj, FALSE);
80 80
81 g_free(user->passport); 81 g_free(user->passport);
82 g_free(user->friendly_name); 82 g_free(user->friendly_name);
83 g_free(user->uid); 83 g_free(user->uid);
84 if (user->extinfo) { 84 if (user->extinfo) {
404 MsnUser *user; 404 MsnUser *user;
405 PurpleConnection *gc; 405 PurpleConnection *gc;
406 406
407 gc = purple_account_get_connection(account); 407 gc = purple_account_get_connection(account);
408 if (gc != NULL) 408 if (gc != NULL)
409 session = gc->proto_data; 409 session = purple_connection_get_protocol_data(gc);
410 410
411 if ((session != NULL) && (user = msn_userlist_find_user(session->userlist, name)) != NULL) 411 if ((session != NULL) && (user = msn_userlist_find_user(session->userlist, name)) != NULL)
412 { 412 {
413 return (user->networkid == MSN_NETWORK_YAHOO); 413 return (user->networkid == MSN_NETWORK_YAHOO);
414 } 414 }
564 if (obj == NULL) { 564 if (obj == NULL) {
565 purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL); 565 purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL);
566 return; 566 return;
567 } 567 }
568 568
569 if (!buddy_icon_cached(account->gc, obj)) { 569 if (!buddy_icon_cached(purple_account_get_connection(account), obj)) {
570 MsnUserList *userlist; 570 MsnUserList *userlist;
571 571
572 userlist = user->userlist; 572 userlist = user->userlist;
573 queue = userlist->buddy_icon_requests; 573 queue = userlist->buddy_icon_requests;
574 574
586 void 586 void
587 msn_user_set_object(MsnUser *user, MsnObject *obj) 587 msn_user_set_object(MsnUser *user, MsnObject *obj)
588 { 588 {
589 g_return_if_fail(user != NULL); 589 g_return_if_fail(user != NULL);
590 590
591 if (user->msnobj != NULL && !msn_object_find_local(msn_object_get_sha1(obj))) 591 if (user->msnobj != NULL)
592 msn_object_destroy(user->msnobj); 592 msn_object_destroy(user->msnobj, TRUE);
593 593
594 user->msnobj = obj; 594 user->msnobj = obj;
595 595
596 if (user->list_op & MSN_LIST_FL_OP) 596 if (user->list_op & MSN_LIST_FL_OP)
597 queue_buddy_icon_request(user); 597 queue_buddy_icon_request(user);