diff libpurple/protocols/silc/silc.c @ 20816:efa448405f3d

Remove explicit setting of wants_to_die from prpls.
author Will Thompson <will.thompson@collabora.co.uk>
date Tue, 09 Oct 2007 13:42:15 +0000
parents 8174f6999308
children ba41f2a60253
line wrap: on
line diff
--- 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;