comparison libpurple/protocols/msn/msn.c @ 24674:f3950234b164

If the MSN user is in the userlist already, then check whether we know the network before adding them. If it's unknown (because the buddy's in the AB or privacy lists only), then request network with an FQY. References #3322. References #6755.

24673:daabf16bd511

msn_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
{
	MsnSession *session;
	MsnUserList *userlist;
	const char *who;

	session = gc->proto_data;
	userlist = session->userlist;
	who = msn_normalize(gc->account, buddy->name);

#endif

	/* XXX - Would group ever be NULL here?  I don't think so...
	 * shx: Yes it should; MSN handles non-grouped buddies, and this is only
	 * internal. */
	if (msn_userlist_find_user(userlist, who) != NULL) {
		/* We already know this buddy. This function takes care of users
		   already in the list and stuff... */
		msn_userlist_add_buddy(userlist, who, group ? group->name : NULL);
	} else {
		/* We need to check the network for this buddy first */
		msn_userlist_save_pending_buddy(userlist, who, group ? group->name : NULL);
		msn_notification_send_fqy(session, who);

24674:f3950234b164

msn_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
{
	MsnSession *session;
	MsnUserList *userlist;
	const char *who;
	MsnUser *user;

	session = gc->proto_data;
	userlist = session->userlist;
	who = msn_normalize(gc->account, buddy->name);

#endif

	/* XXX - Would group ever be NULL here?  I don't think so...
	 * shx: Yes it should; MSN handles non-grouped buddies, and this is only
	 * internal. */
	user = msn_userlist_find_user(userlist, who);
	if ((user != NULL) && (user->networkid != MSN_NETWORK_UNKNOWN)) {
		/* We already know this buddy and their network. This function knows
		   what to do with users already in the list and stuff... */
		msn_userlist_add_buddy(userlist, who, group ? group->name : NULL);
	} else {
		/* We need to check the network for this buddy first */
		msn_userlist_save_pending_buddy(userlist, who, group ? group->name : NULL);
		msn_notification_send_fqy(session, who);