# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 959836019 0
# Node ID f905caee43ca75728678c80e7863b2f713981856
# Parent  b32c837501047082e8f6749056b0dd36af655928
[gaim-migrate @ 311]
Hopefully this'll fix the double-error bug.

committer: Tailor Script <tailor@pidgin.im>

diff -r b32c83750104 -r f905caee43ca src/toc.c
--- a/src/toc.c	Thu Jun 01 03:06:27 2000 +0000
+++ b/src/toc.c	Thu Jun 01 05:06:59 2000 +0000
@@ -139,6 +139,7 @@
 	g_snprintf(buf, sizeof(buf), "Retrieving config...");
 	set_login_progress(5, buf);
 	config = toc_wait_config();
+	state = STATE_ONLINE;
 
 #ifdef USE_APPLET
 	make_buddy();
@@ -347,7 +348,7 @@
 			state = STATE_SIGNON_ACK;
 		else if (!strncasecmp(buffer + sizeof(struct sflap_hdr), "CONFIG:", strlen("CONFIG:"))) {
 			state = STATE_CONFIG;
-		} else if (state != STATE_ONLINE && !strncasecmp(buffer + sizeof(struct sflap_hdr), "ERROR:", strlen("ERROR:"))) {
+		} else if (!strncasecmp(buffer + sizeof(struct sflap_hdr), "ERROR:", strlen("ERROR:"))) {
 			c = strtok(buffer + sizeof(struct sflap_hdr) + strlen("ERROR:"), ":");
 			show_error_dialog(c);
 		}
@@ -444,8 +445,10 @@
 	} else if (!strcasecmp(c, "CONFIG")) {
 		/* do we want to load the buddy list again here? */
 	} else if (!strcasecmp(c, "ERROR")) {
+		/* This should be handled by wait_reply
 		c = strtok(NULL,":");
 		show_error_dialog(c);
+		*/
 	} else if (!strcasecmp(c, "NICK")) {
 		c = strtok(NULL,":");
 		g_snprintf(current_user->username, sizeof(current_user->username), "%s", c);