# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1207266045 0
# Node ID e8d35793bd7147baa0f509edb8cc536ab15ecefc
# Parent  9a84976c8e766c3f2784bdbb360030fa9844ad98
Only call oscar_format_screenname() on connecting if we need to
change our formatting from what the server is using for us.

diff -r 9a84976c8e76 -r e8d35793bd71 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Thu Apr 03 23:38:59 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Thu Apr 03 23:40:45 2008 +0000
@@ -3629,7 +3629,11 @@
 	if (purple_account_get_user_info(account) != NULL)
 		serv_set_info(gc, purple_account_get_user_info(account));
 
-	if (!od->icq)
+	if (!od->icq && strcmp(purple_account_get_username(account), purple_connection_get_display_name(gc)) != 0)
+		/*
+		 * Format the screen name for AIM accounts if it's different
+		 * than what's currently set.
+		 */
 		oscar_format_screenname(gc, account->username);
 
 	/* Set our available message based on the current status */