Mercurial > pidgin

changeset 20815:7a7b3a425666

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
I missed some wants_to_dies in jabber.
author Will Thompson <will.thompson@collabora.co.uk>
date Tue, 09 Oct 2007 13:36:08 +0000
parents bde477ec6a71
children efa448405f3d
files libpurple/protocols/jabber/auth.c libpurple/protocols/jabber/jabber.c
diffstat 2 files changed, 0 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/auth.c	Tue Oct 09 13:32:58 2007 +0000
+++ b/libpurple/protocols/jabber/auth.c	Tue Oct 09 13:36:08 2007 +0000
@@ -50,7 +50,6 @@
 					"<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(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"));
 }
--- a/libpurple/protocols/jabber/jabber.c	Tue Oct 09 13:32:58 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Tue Oct 09 13:36:08 2007 +0000
@@ -144,7 +144,6 @@
 		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 @@
 	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 @@
 					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 @@
 	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 @@
 					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"));
 		}