comparison libpurple/protocols/novell/novell.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

		/* TODO: Would be nice to prompt if not set!
		 *  purple_request_fields(gc, _("Server Address"),...);
		 */

		/* ...but for now just error out with a nice message. */
		purple_connection_error_reason (gc, PURPLE_REASON_OTHER_ERROR,
			_("Unable to connect to server. Please enter the "
			  "address of the server you wish to connect to."));
		return;
	}

		user->conn->ssl_conn->data = purple_ssl_connect(user->client_data,
													  user->conn->addr, user->conn->port,
													  novell_ssl_connected_cb, novell_ssl_connect_error, gc);
		if (user->conn->ssl_conn->data == NULL) {
			purple_connection_error_reason (gc,
				PURPLE_REASON_ENCRYPTION_ERROR,
				_("Error. SSL support is not installed."));
		}
	}

20778:8174f6999308

		/* TODO: Would be nice to prompt if not set!
		 *  purple_request_fields(gc, _("Server Address"),...);
		 */

		/* ...but for now just error out with a nice message. */
		gc->wants_to_die = TRUE;
		purple_connection_error_reason (gc, PURPLE_REASON_INVALID_SETTINGS,
			_("Unable to connect to server. Please enter the "
			  "address of the server you wish to connect to."));
		return;
	}

		user->conn->ssl_conn->data = purple_ssl_connect(user->client_data,
													  user->conn->addr, user->conn->port,
													  novell_ssl_connected_cb, novell_ssl_connect_error, gc);
		if (user->conn->ssl_conn->data == NULL) {
			gc->wants_to_die = TRUE;
			purple_connection_error_reason (gc,
				PURPLE_REASON_ENCRYPTION_ERROR,
				_("Error. SSL support is not installed."));
		}
	}