comparison libpurple/protocols/msn/msn.c @ 23616:6659ba7b3941

Fix a crash when the user isn't in your list.

23615:f4001a130765

static gboolean
msn_can_receive_file(PurpleConnection *gc, const char *who)
{
	PurpleAccount *account;
	char *normal;
	MsnSession *session;
	MsnUser *user;
	gboolean ret;

	account = purple_connection_get_account(gc);

	normal = g_strdup(msn_normalize(account, purple_account_get_username(account)));
	ret = strcmp(normal, msn_normalize(account, who));
	g_free(normal);

	if (ret) {
		session = gc->proto_data;
		user = msn_userlist_find_user(session->userlist, who);
		ret = (user->clientid & MSN_CLIENT_CAP_WEBMSGR) == 0;
		/* Include these too: MSN_CLIENT_CAP_MSNMOBILE|MSN_CLIENT_CAP_MSNDIRECT ? */
	}

	return ret;
}

				return;
		}

	if (group_id >= 0)
	{
		user->group_ids = g_list_append(user->group_ids,
										GINT_TO_POINTER(group_id));
	}

	user->list_op |= (1 << list_id);

23616:6659ba7b3941

static gboolean
msn_can_receive_file(PurpleConnection *gc, const char *who)
{
	PurpleAccount *account;
	gchar *normal;
	gboolean ret;

	account = purple_connection_get_account(gc);

	normal = g_strdup(msn_normalize(account, purple_account_get_username(account)));
	ret = strcmp(normal, msn_normalize(account, who));
	g_free(normal);

	if (ret) {
		MsnSession *session = gc->proto_data;
		MsnUser *user = msn_userlist_find_user(session->userlist, who);
		if (user)
			ret = (user->clientid & MSN_CLIENT_CAP_WEBMSGR) == 0;
		/* Include these too: MSN_CLIENT_CAP_MSNMOBILE|MSN_CLIENT_CAP_MSNDIRECT ? */
	}

	return ret;
}

				return;
		}

	if (group_id >= 0)
	{
		/* This is wrong... user->group_ids contains g_strdup()'d data now */
		user->group_ids = g_list_append(user->group_ids,
										GINT_TO_POINTER(group_id));
	}

	user->list_op |= (1 << list_id);