comparison libpurple/protocols/msn/userlist.c @ 20486:ff4ae9dde291

Make block/unblock work right, as well as being add by a buddy. Finally fixes #723

20485:87eea1c5be97

msn_accept_add_cb(gpointer data)
{
	MsnPermitAdd *pa = data;
	MsnSession *session = pa->gc->proto_data;
	MsnUserList *userlist = session->userlist;
	
	msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_AL);
	msn_userlist_add_buddy(userlist, pa->who, NULL);

	g_free(pa->who);
	g_free(pa->friendly);
	g_free(pa);
}

static void
msn_cancel_add_cb(gpointer data)
{
	MsnPermitAdd *pa = data;

	if (g_list_find(purple_connections_get_all(), pa->gc) != NULL)
	{
		MsnSession *session = pa->gc->proto_data;
		MsnUserList *userlist = session->userlist;

		msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_BL);
	}

	g_free(pa->who);
	g_free(pa->friendly);
	g_free(pa);

/**************************************************************************
 * Utility functions
 **************************************************************************/

static gboolean
msn_userlist_user_is_in_group(MsnUser *user, const char * group_id)
{
	if (user == NULL)
		return FALSE;

		return TRUE;

	return FALSE;
}

static gboolean
msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id)
{
	int list_op;

	if (user == NULL)

	account = session->account;
	gc = purple_account_get_connection(account);

	passport = msn_user_get_passport(user);
	store = msn_user_get_store_name(user);

	if (list_op & MSN_LIST_FL_OP)
	{
		GSList *c;
		for (c = group_ids; c != NULL; c = g_slist_next(c))

	if (list_op & MSN_LIST_PL_OP)
	{
		got_new_entry(gc, passport, store);
	}

	user->list_op |= list_op;
}

/**************************************************************************
 * UserList functions
 **************************************************************************/

msn_userlist_rem_buddy_from_list(MsnUserList *userlist, const char *who,
				 MsnListId list_id)
{
	MsnUser *user;
	const gchar *list;
	
	user = msn_userlist_find_user(userlist, who);
	
	g_return_if_fail(user != NULL);
	
	if ( !msn_userlist_user_is_in_list(user, list_id)) {
		list = lists[list_id];
		purple_debug_info("MSN Userlist", "User %s is not in list %s, not removing.\n", who, list);
		return;
	}
	
	msn_notification_rem_buddy_from_list(userlist->session->notification, list_id, who);
}

/*add buddy*/
void
msn_userlist_add_buddy(MsnUserList *userlist, const char *who, 
					      const char *group_name)
{
	MsnUser *user;
	MsnCallbackState *state = NULL;
	const char *group_id = NULL, *new_group_name;
	

20486:ff4ae9dde291

msn_accept_add_cb(gpointer data)
{
	MsnPermitAdd *pa = data;
	MsnSession *session = pa->gc->proto_data;
	MsnUserList *userlist = session->userlist;
	MsnUser *user = msn_userlist_find_add_user(userlist, pa->who, pa->who);
	
	purple_debug_misc("MSN Userlist", "Accepted the new buddy: %s\n", pa->who);

	msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_AL);

	if (msn_userlist_user_is_in_list(user, MSN_LIST_FL)) {
		msn_del_contact_from_list(session->contact, NULL, pa->who, MSN_LIST_PL);
	}

	g_free(pa->who);
	g_free(pa->friendly);
	g_free(pa);
}

static void
msn_cancel_add_cb(gpointer data)
{
	MsnPermitAdd *pa = data;

	purple_debug_misc("MSN Userlist", "Deniedthe new buddy: %s\n", pa->who);

	if (g_list_find(purple_connections_get_all(), pa->gc) != NULL)
	{
		MsnSession *session = pa->gc->proto_data;
		MsnUserList *userlist = session->userlist;
		MsnCallbackState *state = msn_callback_state_new();
	
		msn_callback_state_set_action(state, MSN_DENIED_BUDDY);

		msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_BL);
		msn_del_contact_from_list(session->contact, state, pa->who, MSN_LIST_PL);
	}

	g_free(pa->who);
	g_free(pa->friendly);
	g_free(pa);

/**************************************************************************
 * Utility functions
 **************************************************************************/

gboolean
msn_userlist_user_is_in_group(MsnUser *user, const char * group_id)
{
	if (user == NULL)
		return FALSE;

		return TRUE;

	return FALSE;
}

gboolean
msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id)
{
	int list_op;

	if (user == NULL)

	account = session->account;
	gc = purple_account_get_connection(account);

	passport = msn_user_get_passport(user);
	store = msn_user_get_store_name(user);
	
	msn_user_set_op(user, list_op);

	if (list_op & MSN_LIST_FL_OP)
	{
		GSList *c;
		for (c = group_ids; c != NULL; c = g_slist_next(c))

	if (list_op & MSN_LIST_PL_OP)
	{
		got_new_entry(gc, passport, store);
	}
}

/**************************************************************************
 * UserList functions
 **************************************************************************/

msn_userlist_rem_buddy_from_list(MsnUserList *userlist, const char *who,
				 MsnListId list_id)
{
	MsnUser *user;
	const gchar *list;
	MsnListOp list_op = 1 << list_id;

	user = msn_userlist_find_user(userlist, who);
	
	g_return_if_fail(user != NULL);
	
	if ( !msn_userlist_user_is_in_list(user, list_id)) {
		list = lists[list_id];
		purple_debug_info("MSN Userlist", "User %s is not in list %s, not removing.\n", who, list);
		return;
	}

	msn_user_unset_op(user, list_op);

	msn_notification_rem_buddy_from_list(userlist->session->notification, list_id, who);
}

/*add buddy*/
void
msn_userlist_add_buddy(MsnUserList *userlist, const char *who, const char *group_name)
{
	MsnUser *user;
	MsnCallbackState *state = NULL;
	const char *group_id = NULL, *new_group_name;