comparison src/protocols/irc/irc.c @ 5791:f5a4a17c58a5

[gaim-migrate @ 6216] IRC works again. committer: Tailor Script <[e-mail]>

5790:995e63fb1a5a

	GaimAccount *account = gaim_connection_get_account(gc);
	struct irc_data *idata;
	char hostname[256];
	char buf[IRC_BUF_LEN];
	char *test;
	const char *charset = gaim_account_get_string(account, "charset", "UTF-8");
	GError *err = NULL;
	
	if (!g_list_find(gaim_connections_get_all(), gc)) {
		close(source);
		return;
	}

	idata = gc->proto_data;

	if (source < 0) {
		gaim_connection_error(gc, "Write error");

	
	g_free(test);
	
	gethostname(hostname, sizeof(hostname) - 1);
	hostname[sizeof(hostname) - 1] = 0;
	if (!*hostname)
		g_snprintf(hostname, sizeof(hostname), "localhost");

	if (gc->account->password != NULL) {
		g_snprintf(buf, sizeof(buf), "PASS %s\r\n", gaim_account_get_password(account));

		if (irc_write(idata->fd, buf, strlen(buf)) < 0) {
			gaim_connection_error(gc, "Write error");
			return;
		}
	}

	g_snprintf(buf, sizeof(buf), "USER %s %s %s :%s\r\n",
		   g_get_user_name(), hostname,
		   idata->server,
		   *gc->account->alias ? gc->account->alias : "gaim");
	if (irc_write(idata->fd, buf, strlen(buf)) < 0) {
		gaim_connection_error(gc, "Write error");
		return;
	}

	g_snprintf(buf, sizeof(buf), "NICK %s\r\n", gaim_connection_get_display_name(gc));
	if (irc_write(idata->fd, buf, strlen(buf)) < 0) {
		gaim_connection_error(gc, "Write error");
		return;
	}

	rc = gaim_proxy_connect(account, idata->server,
			   gaim_account_get_int(account, "port", 6667),
			   irc_login_callback, gc);
	
	if (!account->gc || (rc != 0)) {
		gaim_connection_error(gc, _("Unable to create socket"));
		return;
	}
}

5791:f5a4a17c58a5

	GaimAccount *account = gaim_connection_get_account(gc);
	struct irc_data *idata;
	char hostname[256];
	char buf[IRC_BUF_LEN];
	char *test;
	const char *alias;
	const char *charset = gaim_account_get_string(account, "charset", "UTF-8");
	GError *err = NULL;

	idata = gc->proto_data;

	if (source < 0) {
		gaim_connection_error(gc, "Write error");

	
	g_free(test);
	
	gethostname(hostname, sizeof(hostname) - 1);
	hostname[sizeof(hostname) - 1] = 0;

	if (!*hostname)
		g_snprintf(hostname, sizeof(hostname), "localhost");

	if (gaim_account_get_password(account) != NULL) {
		g_snprintf(buf, sizeof(buf), "PASS %s\r\n",
				   gaim_account_get_password(account));

		if (irc_write(idata->fd, buf, strlen(buf)) < 0) {
			gaim_connection_error(gc, "Write error");
			return;
		}
	}

	alias = gaim_account_get_alias(account);

	g_snprintf(buf, sizeof(buf), "USER %s %s %s :%s\r\n",
		   g_get_user_name(), hostname,
		   idata->server,
		   (alias == NULL ? "gaim" : alias));

	if (irc_write(idata->fd, buf, strlen(buf)) < 0) {
		gaim_connection_error(gc, "Write error");
		return;
	}

	g_snprintf(buf, sizeof(buf), "NICK %s\r\n",
			   gaim_connection_get_display_name(gc));

	if (irc_write(idata->fd, buf, strlen(buf)) < 0) {
		gaim_connection_error(gc, "Write error");
		return;
	}

	rc = gaim_proxy_connect(account, idata->server,
			   gaim_account_get_int(account, "port", 6667),
			   irc_login_callback, gc);
	
	if (rc != 0) {
		gaim_connection_error(gc, _("Unable to create socket"));
		return;
	}
}