# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1191937335 0
# Node ID efa448405f3d98f1507db0d26667d3d2e12bbf44
# Parent  7a7b3a4256660660ef38c78ef4baae6a0532740a
Remove explicit setting of wants_to_die from prpls.

diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/bonjour/bonjour.c
--- a/libpurple/protocols/bonjour/bonjour.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c	Tue Oct 09 13:42:15 2007 +0000
@@ -102,7 +102,6 @@
 
 #ifdef _WIN32
 	if (!dns_sd_available()) {
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason(gc, PURPLE_REASON_OTHER_ERROR,
 			_("The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: "
 			  "http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging"
diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/irc/irc.c
--- a/libpurple/protocols/irc/irc.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/irc/irc.c	Tue Oct 09 13:42:15 2007 +0000
@@ -297,7 +297,6 @@
 	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;
@@ -328,7 +327,6 @@
 					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_NO_SSL_SUPPORT,
 				_("SSL support unavailable"));
 			return;
diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/irc/msgs.c
--- a/libpurple/protocols/irc/msgs.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/irc/msgs.c	Tue Oct 09 13:42:15 2007 +0000
@@ -913,7 +913,6 @@
 				  _("Your selected nickname was rejected by the server.  It probably contains invalid characters."));
 
 	} else {
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason (gc, PURPLE_REASON_INVALID_SETTINGS,
 				  _("Your selected account name was rejected by the server.  It probably contains invalid characters."));
 	}
diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Tue Oct 09 13:42:15 2007 +0000
@@ -799,7 +799,6 @@
 
 	if (!purple_ssl_is_supported())
 	{
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason (gc, PURPLE_REASON_NO_SSL_SUPPORT,
 			_("SSL support is needed for MSN. Please install a supported "
 			  "SSL library."));
diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/msn/session.c
--- a/libpurple/protocols/msn/session.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/msn/session.c	Tue Oct 09 13:42:15 2007 +0000
@@ -346,7 +346,6 @@
 			msg = g_strdup(_("Error parsing HTTP."));
 			break;
 		case MSN_ERROR_SIGN_OTHER:
-			gc->wants_to_die = TRUE;
 			reason = PURPLE_REASON_NAME_IN_USE;
 			msg = g_strdup(_("You have signed on from another location."));
 			if (!purple_account_get_remember_password(session->account))
@@ -365,7 +364,6 @@
 			break;
 		case MSN_ERROR_AUTH:
 			reason = PURPLE_REASON_AUTHENTICATION_FAILED;
-			gc->wants_to_die = TRUE;
 			msg = g_strdup_printf(_("Unable to authenticate: %s"),
 								  (info == NULL ) ?
 								  _("Unknown error") : info);
diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Tue Oct 09 13:42:15 2007 +0000
@@ -291,7 +291,6 @@
 		/* Notify an error message also, because this is important! */
 		purple_notify_error(acct, _("MySpaceIM Error"), str, NULL);
 
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason (gc,
 			PURPLE_REASON_AUTHENTICATION_FAILED, str);
 		g_free(str);
@@ -1559,7 +1558,6 @@
 		purple_notify_error(session->account, 
 				_("No username set"),
 				_("Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile.username and choose a username and try to login again."), NULL);
-		session->gc->wants_to_die = TRUE;
 		purple_connection_error_reason (session->gc, PURPLE_REASON_AUTHENTICATION_FAILED, _("No username set"));
 		return FALSE;
 	}
@@ -1801,13 +1799,11 @@
 		switch (err) {
 			case 260: /* Incorrect password */
 				reason = PURPLE_REASON_AUTHENTICATION_FAILED;
-				session->gc->wants_to_die = TRUE;
 				if (!purple_account_get_remember_password(session->account))
 					purple_account_set_password(session->account, NULL);
 				break;
 			case 6: /* Logged in elsewhere */
 				reason = PURPLE_REASON_NAME_IN_USE;
-				session->gc->wants_to_die = TRUE;
 				if (!purple_account_get_remember_password(session->account))
 					purple_account_set_password(session->account, NULL);
 				break;
diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/novell/novell.c
--- a/libpurple/protocols/novell/novell.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/novell/novell.c	Tue Oct 09 13:42:15 2007 +0000
@@ -133,7 +133,6 @@
 				 */
 				if (!purple_account_get_remember_password(gc->account))
 					purple_account_set_password(gc->account, NULL);
-				gc->wants_to_die = TRUE;
 				reason = PURPLE_REASON_AUTHENTICATION_FAILED;
 				break;
 			default:
@@ -2019,7 +2018,6 @@
 	gc = purple_account_get_connection(account);
 	if (gc)
 	{
-		gc->wants_to_die = TRUE; /* we don't want to reconnect in this case */
 		if (!purple_account_get_remember_password(account))
 			purple_account_set_password(account, NULL);
 		purple_connection_error_reason (gc, PURPLE_REASON_NAME_IN_USE,
@@ -2178,7 +2176,6 @@
 		 */
 
 		/* ...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."));
@@ -2207,7 +2204,6 @@
 													  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_NO_SSL_SUPPORT,
 				_("Error. SSL support is not installed."));
diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/oscar/flap_connection.c
--- a/libpurple/protocols/oscar/flap_connection.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/oscar/flap_connection.c	Tue Oct 09 13:42:15 2007 +0000
@@ -387,7 +387,6 @@
 			tmp = g_strdup(_("You have signed on from another location."));
 			if (!purple_account_get_remember_password(account))
 				purple_account_set_password(account, NULL);
-			od->gc->wants_to_die = TRUE;
 		} else if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED)
 			tmp = g_strdup(_("Server closed the connection."));
 		else if (conn->disconnect_reason == OSCAR_DISCONNECT_LOST_CONNECTION)
diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Tue Oct 09 13:42:15 2007 +0000
@@ -1258,7 +1258,6 @@
 	if (!aim_snvalid(purple_account_get_username(account))) {
 		gchar *buf;
 		buf = g_strdup_printf(_("Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."), purple_account_get_username(account));
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason(gc, PURPLE_REASON_INVALID_SETTINGS, buf);
 		g_free(buf);
 	}
@@ -1342,19 +1341,16 @@
 		switch (info->errorcode) {
 		case 0x01:
 			/* Unregistered screen name */
-			gc->wants_to_die = TRUE;
 			purple_connection_error_reason(gc, PURPLE_REASON_AUTHENTICATION_FAILED, _("Invalid screen name."));
 			break;
 		case 0x05:
 			/* Incorrect password */
-			gc->wants_to_die = TRUE;
 			if (!purple_account_get_remember_password(account))
 				purple_account_set_password(account, NULL);
 			purple_connection_error_reason(gc, PURPLE_REASON_AUTHENTICATION_FAILED, _("Incorrect password."));
 			break;
 		case 0x11:
 			/* Suspended account */
-			gc->wants_to_die = TRUE;
 			purple_connection_error_reason(gc, PURPLE_REASON_AUTHENTICATION_FAILED, _("Your account is currently suspended."));
 			break;
 		case 0x14:
@@ -1363,22 +1359,18 @@
 			break;
 		case 0x18:
 			/* screen name connecting too frequently */
-			gc->wants_to_die = TRUE;
 			purple_connection_error_reason(gc, PURPLE_REASON_OTHER_ERROR, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."));
 			break;
 		case 0x1c:
 			/* client too old */
-			gc->wants_to_die = TRUE;
 			g_snprintf(buf, sizeof(buf), _("The client version you are using is too old. Please upgrade at %s"), PURPLE_WEBSITE);
 			purple_connection_error_reason(gc, PURPLE_REASON_OTHER_ERROR, buf);
 			break;
 		case 0x1d:
 			/* IP address connecting too frequently */
-			gc->wants_to_die = TRUE;
 			purple_connection_error_reason(gc, PURPLE_REASON_OTHER_ERROR, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."));
 			break;
 		default:
-			gc->wants_to_die = TRUE;
 			purple_connection_error_reason(gc, PURPLE_REASON_AUTHENTICATION_FAILED, _("Authentication failed"));
 			break;
 		}
@@ -1434,7 +1426,6 @@
 	PurpleConnection *gc = user_data;
 
 	/* Disconnect */
-	gc->wants_to_die = TRUE;
 	purple_connection_error_reason(gc, PURPLE_REASON_AUTHENTICATION_FAILED,
 		_("The SecurID key entered is invalid."));
 }
diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/qq/login_logout.c
--- a/libpurple/protocols/qq/login_logout.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/qq/login_logout.c	Tue Oct 09 13:42:15 2007 +0000
@@ -479,7 +479,6 @@
 
 	switch (ret) {
 	case QQ_LOGIN_REPLY_PWD_ERROR:
-		gc->wants_to_die = TRUE;
 		if (!purple_account_get_remember_password(gc->account))
 			purple_account_set_password(gc->account, NULL);
 		purple_connection_error_reason(gc,
diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/sametime/sametime.c
--- a/libpurple/protocols/sametime/sametime.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Tue Oct 09 13:42:15 2007 +0000
@@ -1563,14 +1563,12 @@
       case INCORRECT_LOGIN:
       case USER_UNREGISTERED:
       case GUEST_IN_USE:
-        gc->wants_to_die = TRUE;
         reason = PURPLE_REASON_AUTHENTICATION_FAILED;
         break;
 
       case ENCRYPT_MISMATCH:
       case ERR_ENCRYPT_NO_SUPPORT:
       case ERR_NO_COMMON_ENCRYPT:
-        gc->wants_to_die = TRUE;
         reason = PURPLE_REASON_ENCRYPTION_ERROR;
         break;
 
@@ -1580,7 +1578,6 @@
 
       case MULTI_SERVER_LOGIN:
       case MULTI_SERVER_LOGIN2:
-        gc->wants_to_die = TRUE;
         reason = PURPLE_REASON_NAME_IN_USE;
         break;
 
@@ -3649,7 +3646,6 @@
 
 static void prompt_host_cancel_cb(PurpleConnection *gc) {
   const char *msg = _("No Sametime Community Server specified");
-  gc->wants_to_die = TRUE;
   purple_connection_error_reason(gc, PURPLE_REASON_INVALID_SETTINGS, msg);
 }
 
diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/silc/silc.c
--- a/libpurple/protocols/silc/silc.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/silc/silc.c	Tue Oct 09 13:42:15 2007 +0000
@@ -229,19 +229,16 @@
 		break;
 
 	case SILC_CLIENT_CONN_ERROR_KE:
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason(gc, PURPLE_REASON_ENCRYPTION_ERROR,
 		                             _("Key Exchange failed"));
 		break;
 
 	case SILC_CLIENT_CONN_ERROR_AUTH:
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason(gc, PURPLE_REASON_AUTHENTICATION_FAILED,
 		                             _("Authentication failed"));
 		break;
 
 	case SILC_CLIENT_CONN_ERROR_RESUME:
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason(gc, PURPLE_REASON_OTHER_ERROR,
 		                             _("Resuming detached session failed. "
 		                               "Press Reconnect to create new connection."));
@@ -360,7 +357,6 @@
 				(char *)purple_account_get_string(account, "private-key", prd),
 				(gc->password == NULL) ? "" : gc->password,
 				&sg->public_key, &sg->private_key)) {
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason(gc, PURPLE_REASON_OTHER_ERROR,
 		                             _("Could not load SILC key pair"));
 		gc->proto_data = NULL;
@@ -448,7 +444,6 @@
 	/* Init SILC client */
 	if (!silc_client_init(client, username, hostname, realname,
 			      silcpurple_running, account)) {
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason(gc, PURPLE_REASON_OTHER_ERROR,
 		                             _("Cannot initialize SILC protocol"));
 		return;
@@ -456,7 +451,6 @@
 
 	/* Check the ~/.silc dir and create it, and new key pair if necessary. */
 	if (!silcpurple_check_silc_dir(gc)) {
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason(gc, PURPLE_REASON_OTHER_ERROR,
 		                             _("Error loading SILC key pair"));
 		return;
diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/simple/simple.c
--- a/libpurple/protocols/simple/simple.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/simple/simple.c	Tue Oct 09 13:42:15 2007 +0000
@@ -1042,8 +1042,6 @@
 			if(sip->registerstatus != SIMPLE_REGISTER_RETRY) {
 				purple_debug_info("simple", "REGISTER retries %d\n", sip->registrar.retries);
 				if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) {
-					purple_debug_info("simple", "Setting wants_to_die to true.\n");
-					sip->gc->wants_to_die = TRUE;
 					if (!purple_account_get_remember_password(sip->gc->account))
 						purple_account_set_password(sip->gc->account, NULL);
 					purple_connection_error_reason(sip->gc,
@@ -1061,7 +1059,6 @@
 			if (sip->registerstatus != SIMPLE_REGISTER_RETRY) {
 				purple_debug_info("simple", "Unrecognized return code for REGISTER.\n");
 				if (sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) {
-					sip->gc->wants_to_die = TRUE;
 					purple_connection_error_reason(sip->gc, PURPLE_REASON_OTHER_ERROR,
 						_("Unknown server response."));
 					return TRUE;
@@ -1709,7 +1706,6 @@
 	gc = purple_account_get_connection(account);
 
 	if (strpbrk(username, " \t\v\r\n") != NULL) {
-		gc->wants_to_die = TRUE;
 		purple_connection_error_reason(gc, PURPLE_REASON_INVALID_SETTINGS,
 			_("SIP screen names may not contain whitespaces or @ symbols"));
 		return;
diff -r 7a7b3a425666 -r efa448405f3d libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Tue Oct 09 13:36:08 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Tue Oct 09 13:42:15 2007 +0000
@@ -201,7 +201,6 @@
 	char *message = NULL;
 
 	if (pkt->service == YAHOO_SERVICE_LOGOFF && pkt->status == -1) {
-		gc->wants_to_die = TRUE;
 		if (!purple_account_get_remember_password(account))
 			purple_account_set_password(account, NULL);
 		purple_connection_error_reason(gc, PURPLE_REASON_NAME_IN_USE,
@@ -2140,7 +2139,6 @@
 	else
 		fullmsg = g_strdup(msg);
 
-	gc->wants_to_die = TRUE;
 	purple_connection_error_reason(gc, PURPLE_REASON_AUTHENTICATION_FAILED, fullmsg);
 	g_free(msg);
 	g_free(fullmsg);