Mercurial > pidgin
comparison libpurple/protocols/oscar/oscar.c @ 25529:0bb35311dfe0
propagate from branch 'im.pidgin.pidgin' (head 2c4a5ddc5d50dcd6e82192d1f90614217624a126)
to branch 'im.pidgin.cpw.darkrain42.buddy-add' (head d06f16d73d1bf48c1f572eab5e5c9dba2002807b)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Wed, 25 Feb 2009 10:39:04 +0000 |
parents | a46e527d1473 c02da09b567f |
children | 9ea3474065dc |
comparison
equal
deleted
inserted
replaced
25527:92a19e94add6 | 25529:0bb35311dfe0 |
---|---|
4915 purple_blist_remove_buddy(buddy); | 4915 purple_blist_remove_buddy(buddy); |
4916 | 4916 |
4917 return; | 4917 return; |
4918 } | 4918 } |
4919 | 4919 |
4920 if ((od->ssi.received_data) && !(aim_ssi_itemlist_finditem(od->ssi.local, group->name, buddy->name, AIM_SSI_TYPE_BUDDY))) { | 4920 if (od->ssi.received_data) { |
4921 purple_debug_info("oscar", | 4921 if (!aim_ssi_itemlist_finditem(od->ssi.local, group->name, buddy->name, AIM_SSI_TYPE_BUDDY)) { |
4922 "ssi: adding buddy %s to group %s\n", buddy->name, group->name); | 4922 purple_debug_info("oscar", |
4923 aim_ssi_addbuddy(od, buddy->name, group->name, NULL, purple_buddy_get_alias_only(buddy), NULL, NULL, 0); | 4923 "ssi: adding buddy %s to group %s\n", buddy->name, group->name); |
4924 | 4924 aim_ssi_addbuddy(od, buddy->name, group->name, NULL, purple_buddy_get_alias_only(buddy), NULL, NULL, 0); |
4925 /* Mobile users should always be online */ | 4925 |
4926 if (buddy->name[0] == '+') { | 4926 /* Mobile users should always be online */ |
4927 purple_prpl_got_user_status(account, | 4927 if (buddy->name[0] == '+') { |
4928 purple_buddy_get_name(buddy), | 4928 purple_prpl_got_user_status(account, |
4929 OSCAR_STATUS_ID_AVAILABLE, NULL); | 4929 purple_buddy_get_name(buddy), |
4930 purple_prpl_got_user_status(account, | 4930 OSCAR_STATUS_ID_AVAILABLE, NULL); |
4931 purple_buddy_get_name(buddy), | 4931 purple_prpl_got_user_status(account, |
4932 OSCAR_STATUS_ID_MOBILE, NULL); | 4932 purple_buddy_get_name(buddy), |
4933 OSCAR_STATUS_ID_MOBILE, NULL); | |
4934 } | |
4935 } else if (aim_ssi_waitingforauth(od->ssi.local, | |
4936 aim_ssi_itemlist_findparentname(od->ssi.local, purple_buddy_get_name(buddy)), | |
4937 purple_buddy_get_name(buddy))) { | |
4938 /* Not authorized -- Re-request authorization */ | |
4939 purple_auth_sendrequest(gc, purple_buddy_get_name(buddy)); | |
4933 } | 4940 } |
4934 } | 4941 } |
4935 | 4942 |
4936 /* XXX - Should this be done from AIM accounts, as well? */ | 4943 /* XXX - Should this be done from AIM accounts, as well? */ |
4937 if (od->icq) | 4944 if (od->icq) |