im.pidgin.cpw.resiak.disconnectreason: cf6996bce6763681599c7a5412f6b256943226b0

[resiak at soc.pidgin.im]

-----------------------------------------------------------------
Revision: cf6996bce6763681599c7a5412f6b256943226b0
Ancestor: 267c137f0b2ae0c530298f1b8b4c42467776db8b
Author: resiak at soc.pidgin.im
Date: 2007-10-09T13:36:08
Branch: im.pidgin.cpw.resiak.disconnectreason

Modified files:
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/jabber.c

ChangeLog: 

I missed some wants_to_dies in jabber.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/auth.c	538bd21583d778e0f680b1389d61c838df366c2e
+++ libpurple/protocols/jabber/auth.c	f05f616a7460175e37c93dd4fa2900ff4095001f
@@ -50,7 +50,6 @@ jabber_process_starttls(JabberStream *js
 					"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
 			return TRUE;
 		} else if(xmlnode_get_child(starttls, "required")) {
-			js->gc->wants_to_die = TRUE;
 			purple_connection_error_reason (js->gc, PURPLE_REASON_NO_SSL_SUPPORT,
 				_("Server requires TLS/SSL for login.  No TLS/SSL support found."));
 			return TRUE;
@@ -115,7 +114,6 @@ static void disallow_plaintext_auth(Purp
 
 static void disallow_plaintext_auth(PurpleAccount *account)
 {
-	account->gc->wants_to_die = TRUE;
 	purple_connection_error_reason (account->gc, PURPLE_REASON_ENCRYPTION_ERROR,
 		_("Server requires plaintext authentication over an unencrypted stream"));
 }
============================================================
--- libpurple/protocols/jabber/jabber.c	6daeab406824ec662e7ab48ee80e61eb37e163ed
+++ libpurple/protocols/jabber/jabber.c	bd2b74def481f10e2be421758e830ea2f019f400
@@ -144,7 +144,6 @@ static void jabber_stream_features_parse
 		if(jabber_process_starttls(js, packet))
 			return;
 	} else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE) && !js->gsc) {
-		js->gc->wants_to_die = TRUE;
 		purple_connection_error_reason (js->gc, PURPLE_REASON_ENCRYPTION_ERROR,
 			_("You require encryption, but it is not available on this server."));
 		return;
@@ -588,14 +587,12 @@ jabber_login(PurpleAccount *account)
 	js->old_length = -1;
 
 	if(!js->user) {
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason (gc, PURPLE_REASON_INVALID_SETTINGS,
 			_("Invalid XMPP ID"));
 		return;
 	}
 	
 	if (!js->user->domain || *(js->user->domain) == '\0') {
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason (gc, PURPLE_REASON_INVALID_SETTINGS,
 			_("Invalid XMPP ID. Domain must be set."));
 		return;
@@ -627,7 +624,6 @@ jabber_login(PurpleAccount *account)
 					purple_account_get_int(account, "port", 5223), jabber_login_callback_ssl,
 					jabber_ssl_connect_failure, js->gc);
 		} else {
-			js->gc->wants_to_die = TRUE;
 			purple_connection_error_reason (js->gc, PURPLE_REASON_NO_SSL_SUPPORT,
 				_("SSL support unavailable"));
 		}
@@ -1082,7 +1078,6 @@ void jabber_register_account(PurpleAccou
 	js->old_length = -1;
 
 	if(!js->user) {
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason (gc, PURPLE_REASON_INVALID_SETTINGS,
 			_("Invalid XMPP ID"));
 		return;
@@ -1116,7 +1111,6 @@ void jabber_register_account(PurpleAccou
 					purple_account_get_int(account, "port", 5222),
 					jabber_login_callback_ssl, jabber_ssl_connect_failure, gc);
 		} else {
-			gc->wants_to_die = TRUE;
 			purple_connection_error_reason (gc, PURPLE_REASON_NO_SSL_SUPPORT,
 				_("SSL support unavailable"));
 		}