Mercurial > pidgin.yaz
comparison libpurple/protocols/oscar/oscar.c @ 25006:032651900c32
Oscar: Re-request authorization when adding a buddy that is already on the list.
This might want to simply call purple_auth_request instead of popping up
the request dialog again. I'm not sure which is better.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 21 Dec 2008 19:15:21 +0000 |
parents | e4b1ba7c351c |
children | 7bfaa0b61a83 |
comparison
equal
deleted
inserted
replaced
25005:401f548e3544 | 25006:032651900c32 |
---|---|
4812 purple_blist_remove_buddy(buddy); | 4812 purple_blist_remove_buddy(buddy); |
4813 | 4813 |
4814 return; | 4814 return; |
4815 } | 4815 } |
4816 | 4816 |
4817 if ((od->ssi.received_data) && !(aim_ssi_itemlist_finditem(od->ssi.local, group->name, buddy->name, AIM_SSI_TYPE_BUDDY))) { | 4817 if (od->ssi.received_data) { |
4818 purple_debug_info("oscar", | 4818 if (!aim_ssi_itemlist_finditem(od->ssi.local, group->name, buddy->name, AIM_SSI_TYPE_BUDDY)) { |
4819 "ssi: adding buddy %s to group %s\n", buddy->name, group->name); | 4819 purple_debug_info("oscar", |
4820 aim_ssi_addbuddy(od, buddy->name, group->name, NULL, purple_buddy_get_alias_only(buddy), NULL, NULL, 0); | 4820 "ssi: adding buddy %s to group %s\n", buddy->name, group->name); |
4821 | 4821 aim_ssi_addbuddy(od, buddy->name, group->name, NULL, purple_buddy_get_alias_only(buddy), NULL, NULL, 0); |
4822 /* Mobile users should always be online */ | 4822 |
4823 if (buddy->name[0] == '+') { | 4823 /* Mobile users should always be online */ |
4824 purple_prpl_got_user_status(account, | 4824 if (buddy->name[0] == '+') { |
4825 purple_buddy_get_name(buddy), | 4825 purple_prpl_got_user_status(account, |
4826 OSCAR_STATUS_ID_AVAILABLE, NULL); | 4826 purple_buddy_get_name(buddy), |
4827 purple_prpl_got_user_status(account, | 4827 OSCAR_STATUS_ID_AVAILABLE, NULL); |
4828 purple_buddy_get_name(buddy), | 4828 purple_prpl_got_user_status(account, |
4829 OSCAR_STATUS_ID_MOBILE, NULL); | 4829 purple_buddy_get_name(buddy), |
4830 OSCAR_STATUS_ID_MOBILE, NULL); | |
4831 } | |
4832 } else if (aim_ssi_waitingforauth(od->ssi.local, | |
4833 aim_ssi_itemlist_findparentname(od->ssi.local, purple_buddy_get_name(buddy)), | |
4834 purple_buddy_get_name(buddy))) { | |
4835 /* Not authorized -- Re-request authorization */ | |
4836 purple_auth_sendrequest(gc, purple_buddy_get_name(buddy)); | |
4830 } | 4837 } |
4831 } | 4838 } |
4832 | 4839 |
4833 /* XXX - Should this be done from AIM accounts, as well? */ | 4840 /* XXX - Should this be done from AIM accounts, as well? */ |
4834 if (od->icq) | 4841 if (od->icq) |