comparison libgaim/protocols/irc/irc.c @ 14262:baff095b146c

[gaim-migrate @ 16944] Rename GaimProxyConnectInfo to GaimProxyConnectData, and change the variables from connect_info to connect_data. Sorry, but I wanted to get this right before it becomes permanent. committer: Tailor Script <[e-mail]>

14261:bb060cdc23d1

		}
	}

	if (!irc->gsc) {

		irc->connect_info = gaim_proxy_connect(account, irc->server,
				 gaim_account_get_int(account, "port", IRC_DEFAULT_PORT),
				 irc_login_cb, gc);

		if (!irc->connect_info || !gaim_account_get_connection(account)) {
			gaim_connection_error(gc, _("Couldn't create socket"));
			return;
		}
	}
}

static void irc_login_cb(gpointer data, gint source, const gchar *error_message)
{
	GaimConnection *gc = data;
	struct irc_conn *irc = gc->proto_data;

	irc->connect_info = NULL;

	if (source < 0) {
		gaim_connection_error(gc, _("Couldn't connect to host"));
		return;
	}

		return;

	if (irc->gsc || (irc->fd >= 0))
		irc_cmd_quit(irc, "quit", NULL, NULL);

	if (irc->connect_info)
		gaim_proxy_connect_cancel(irc->connect_info);

	if (gc->inpa)
		gaim_input_remove(gc->inpa);

	g_free(irc->inbuf);

14262:baff095b146c

		}
	}

	if (!irc->gsc) {

		irc->connect_data = gaim_proxy_connect(account, irc->server,
				 gaim_account_get_int(account, "port", IRC_DEFAULT_PORT),
				 irc_login_cb, gc);

		if (!irc->connect_data || !gaim_account_get_connection(account)) {
			gaim_connection_error(gc, _("Couldn't create socket"));
			return;
		}
	}
}

static void irc_login_cb(gpointer data, gint source, const gchar *error_message)
{
	GaimConnection *gc = data;
	struct irc_conn *irc = gc->proto_data;

	irc->connect_data = NULL;

	if (source < 0) {
		gaim_connection_error(gc, _("Couldn't connect to host"));
		return;
	}

		return;

	if (irc->gsc || (irc->fd >= 0))
		irc_cmd_quit(irc, "quit", NULL, NULL);

	if (irc->connect_data)
		gaim_proxy_connect_cancel(irc->connect_data);

	if (gc->inpa)
		gaim_input_remove(gc->inpa);

	g_free(irc->inbuf);