comparison libpurple/protocols/irc/irc.c @ 20778:8174f6999308

Sprinkle gc->wants_to_die = TRUE liberally around connection errors that really ought to have been setting it already so that it is always set when a disconnection reason is fatal. In a couple of other places, fix the reason to be more accurate and not be fatal.

20777:c40416c4eca6

	gc = purple_account_get_connection(account);
	gc->flags |= PURPLE_CONNECTION_NO_NEWLINES;

	if (strpbrk(username, " \t\v\r\n") != NULL) {
		purple_connection_error_reason (gc, PURPLE_REASON_INVALID_SETTINGS,
			_("IRC nicks may not contain whitespace"));
		return;
	}

		if (purple_ssl_is_supported()) {
			irc->gsc = purple_ssl_connect(account, irc->server,
					purple_account_get_int(account, "port", IRC_DEFAULT_SSL_PORT),
					irc_login_cb_ssl, irc_ssl_connect_failure, gc);
		} else {
			purple_connection_error_reason (gc, PURPLE_REASON_ENCRYPTION_ERROR,
				_("SSL support unavailable"));
			return;
		}
	}

20778:8174f6999308

	gc = purple_account_get_connection(account);
	gc->flags |= PURPLE_CONNECTION_NO_NEWLINES;

	if (strpbrk(username, " \t\v\r\n") != NULL) {
		gc->wants_to_die = TRUE;
		purple_connection_error_reason (gc, PURPLE_REASON_INVALID_SETTINGS,
			_("IRC nicks may not contain whitespace"));
		return;
	}

		if (purple_ssl_is_supported()) {
			irc->gsc = purple_ssl_connect(account, irc->server,
					purple_account_get_int(account, "port", IRC_DEFAULT_SSL_PORT),
					irc_login_cb_ssl, irc_ssl_connect_failure, gc);
		} else {
			gc->wants_to_die = TRUE;
			purple_connection_error_reason (gc, PURPLE_REASON_ENCRYPTION_ERROR,
				_("SSL support unavailable"));
			return;
		}
	}