view libpurple/eventloop.c @ 24476:3d6fe79753c3

This should fix another crash I've seen. We weren't correctly cancelling the proxy connect when we destroyed the servconn because we were only calling msn_servconn_disconnect() if we had actually connected. So always call msn_servconn_disconnect() from msn_servconn_destroy() and let the disconnect function deal with only closing stuff that is actually open. Here's the backtrace: #0 0x0000000000000000 in ?? () #1 0x00000000005f95e0 in connect_cb (data=0x2ab92ef6e7b0, source=7, error_message=0x0) at servconn.c:185 #2 0x000000000056e7da in purple_proxy_connect_data_connected (connect_data=0x2ab92ef70260) at proxy.c:598 #3 0x000000000056e90d in socket_ready_cb (data=0x2ab92ef70260, source=7, cond=PURPLE_INPUT_WRITE) at proxy.c:657 #4 0x00000000004db70c in pidgin_io_invoke (source=0x2ab92ee4be50, condition=G_IO_OUT, data=0x2ab92dfd3130) at gtkeventloop.cc:79 In frame 1, servconn is not valid (it has already been freed)

/**
 * @file eventloop.c Purple Event Loop API
 * @ingroup core
 */

/* purple
 *
 * Purple is the legal property of its developers, whose names are too numerous
 * to list here.  Please refer to the COPYRIGHT file distributed with this
 * source distribution.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
#include "eventloop.h"
#include "internal.h"

static PurpleEventLoopUiOps *eventloop_ui_ops = NULL;

guint
purple_timeout_add(guint interval, GSourceFunc function, gpointer data)
{
	PurpleEventLoopUiOps *ops = purple_eventloop_get_ui_ops();

	return ops->timeout_add(interval, function, data);
}

guint
purple_timeout_add_seconds(guint interval, GSourceFunc function, gpointer data)
{
	PurpleEventLoopUiOps *ops = purple_eventloop_get_ui_ops();

	if (ops->timeout_add_seconds)
		return ops->timeout_add_seconds(interval, function, data);
	else
		return ops->timeout_add(1000 * interval, function, data);
}

gboolean
purple_timeout_remove(guint tag)
{
	PurpleEventLoopUiOps *ops = purple_eventloop_get_ui_ops();

	return ops->timeout_remove(tag);
}

guint
purple_input_add(int source, PurpleInputCondition condition, PurpleInputFunction func, gpointer user_data)
{
	PurpleEventLoopUiOps *ops = purple_eventloop_get_ui_ops();

	return ops->input_add(source, condition, func, user_data);
}

gboolean
purple_input_remove(guint tag)
{
	PurpleEventLoopUiOps *ops = purple_eventloop_get_ui_ops();

	return ops->input_remove(tag);
}

int
purple_input_get_error(int fd, int *error)
{
	PurpleEventLoopUiOps *ops = purple_eventloop_get_ui_ops();

	if (ops->input_get_error)
	{
		int ret = ops->input_get_error(fd, error);
		errno = *error;
		return ret;
	}
	else
	{
		socklen_t len;
		len = sizeof(*error);

		return getsockopt(fd, SOL_SOCKET, SO_ERROR, error, &len);
	}
}

void
purple_eventloop_set_ui_ops(PurpleEventLoopUiOps *ops)
{
	eventloop_ui_ops = ops;
}

PurpleEventLoopUiOps *
purple_eventloop_get_ui_ops(void)
{
	g_return_val_if_fail(eventloop_ui_ops != NULL, NULL);

	return eventloop_ui_ops;
}