# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1188885876 0
# Node ID e6548df6262e4d2dd1040c8b63a399379b1d3df4
# Parent  0b8740878f9e96973bf8e6e6e2a57499ec4b3d0b
Three small changes:
1. Set wants_to_die for MySpace accounts when you used the incorrect
   password.  This tells libpurple not to try to reconnect.
2. Don't display the purple_notify_error() if we call
   purple_connection_error(), because that causes the same message to
   be displayed to the user in two different places
3. Free full_errmsg when we're done with it

diff -r 0b8740878f9e -r e6548df6262e libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Tue Sep 04 05:44:21 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Tue Sep 04 06:04:36 2007 +0000
@@ -1775,15 +1775,20 @@
 	purple_debug_info("msim", "msim_error (sesskey=%d): %s\n", 
 			session->sesskey, full_errmsg);
 
-	purple_notify_error(session->account, g_strdup(_("MySpaceIM Error")), 
-			full_errmsg, NULL);
-
 	/* Destroy session if fatal. */
 	if (msim_msg_get(msg, "fatal")) {
 		purple_debug_info("msim", "fatal error, closing\n");
+		if (err == 260)
+			/* Incorrect password */
+			session->gc->wants_to_die = TRUE;
 		purple_connection_error(session->gc, full_errmsg);
+	} else {
+		purple_notify_error(session->account, g_strdup(_("MySpaceIM Error")), 
+				full_errmsg, NULL);
 	}
 
+	g_free(full_errmsg);
+
 	return TRUE;
 }