# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1189559635 0
# Node ID 0c83ec8cf17c9a6c5b32a2b4c2f69d6c2a6c2e23
# Parent  a25604fbfa92ba0a5e5baeff23c440a35ddef5c0# Parent  39d620a939072828460ec1773dc8440cd3460427
merge of 'bda49fb76ee1731eebada61327489c4d42d07e66'
     and 'c5468fb873563f4e1249323a03f5531e192965f3'

diff -r a25604fbfa92 -r 0c83ec8cf17c libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Wed Sep 12 00:30:19 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Wed Sep 12 01:13:55 2007 +0000
@@ -1527,9 +1527,8 @@
 	 * address and not username. Will be freed in msim_session_destroy(). */
 	session->username = msim_msg_get_string(msg, "uniquenick");
 
-	/* If a local alias wasn't set, set it to user's username. */
-	if (!session->account->alias || !strlen(session->account->alias))
-		purple_account_set_alias(session->account, session->username);
+	/* Set display name to username (otherwise will show email address) */
+	purple_connection_set_display_name(session->gc, session->username);
 
 	/* The session is now set up, ready to be connected. This emits the
 	 * signedOn signal, so clients can now do anything with msimprpl, and