comparison libgaim/protocols/silc/silc.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

	const char *dfile;

	g_return_if_fail(gc != NULL);

	sg = gc->proto_data;
	sg->connect_info = NULL;

	if (source < 0) {
		gaim_connection_error(gc, _("Connection failed"));
		return;
	}

	sg->gc = gc;
	sg->account = account;
	gc->proto_data = sg;

	/* Connect to the SILC server */
	sg->connect_info = gaim_proxy_connect(account,
			       gaim_account_get_string(account, "server",
						       "silc.silcnet.org"),
			       gaim_account_get_int(account, "port", 706),
			       silcgaim_login_connected, gc);
	if (sg->connect_info == NULL)
	{
		gaim_connection_error(gc, _("Unable to create connection"));
		return;
	}

silcgaim_close_final(gpointer *context)
{
	SilcGaim sg = (SilcGaim)context;
	silc_client_stop(sg->client);
	silc_client_free(sg->client);
	if (sg->connect_info != NULL)
		gaim_proxy_connect_cancel(sg->connect_info);
#ifdef HAVE_SILCMIME_H
	if (sg->mimeass)
		silc_mime_assembler_free(sg->mimeass);
#endif
	silc_free(sg);

14262:baff095b146c

	const char *dfile;

	g_return_if_fail(gc != NULL);

	sg = gc->proto_data;
	sg->connect_data = NULL;

	if (source < 0) {
		gaim_connection_error(gc, _("Connection failed"));
		return;
	}

	sg->gc = gc;
	sg->account = account;
	gc->proto_data = sg;

	/* Connect to the SILC server */
	sg->connect_data = gaim_proxy_connect(account,
			       gaim_account_get_string(account, "server",
						       "silc.silcnet.org"),
			       gaim_account_get_int(account, "port", 706),
			       silcgaim_login_connected, gc);
	if (sg->connect_data == NULL)
	{
		gaim_connection_error(gc, _("Unable to create connection"));
		return;
	}

silcgaim_close_final(gpointer *context)
{
	SilcGaim sg = (SilcGaim)context;
	silc_client_stop(sg->client);
	silc_client_free(sg->client);
	if (sg->connect_data != NULL)
		gaim_proxy_connect_cancel(sg->connect_data);
#ifdef HAVE_SILCMIME_H
	if (sg->mimeass)
		silc_mime_assembler_free(sg->mimeass);
#endif
	silc_free(sg);