comparison libpurple/protocols/msn/msn.c @ 25881:ca01403251f1

explicit merge of 'dabe77d56a2fc7c171caa81bd12d72ce8737a7a8' and 'b299a165920a9d922e9b8c27b4c879c77b43efe1'

25880:be87547aa431

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

	session = gc->proto_data;
	userlist = session->userlist;
	who = msn_normalize(purple_connection_get_account(gc), purple_buddy_get_name(buddy));

#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, gname);
	} else {
		/* We need to check the network for this buddy first */
		msn_userlist_save_pending_buddy(userlist, who, gname);
		msn_notification_send_fqy(session, who);

25881:ca01403251f1

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

	session = gc->proto_data;
	userlist = session->userlist;
	who = msn_normalize(purple_connection_get_account(gc), purple_buddy_get_name(buddy));

#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, gname);
	} else {
		/* We need to check the network for this buddy first */
		msn_userlist_save_pending_buddy(userlist, who, gname);
		msn_notification_send_fqy(session, who);