# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1123900017 0
# Node ID e5aa4398003e45c5e4015090aa341ff8c8a65218
# Parent  df67c09ade6e572e341b1c0c6fe6d38b15b4e746
[gaim-migrate @ 13416]
Fix the bug where our screen name would not be shown when sending an
IM to someone over protocols where you do not have a server-side alias,
and you have not set a self-alias for yourself.

This was caused by Sean's commit of a patch which brough conversastion.c
to revision 1.644.  Anyone know the reason for this change?  The
commit message was
"Todd Troxell removed IM aliases from chat rooms. Unfortunate, but necessary"

committer: Tailor Script <tailor@pidgin.im>

diff -r df67c09ade6e -r e5aa4398003e src/account.c
--- a/src/account.c	Sat Aug 13 00:49:50 2005 +0000
+++ b/src/account.c	Sat Aug 13 02:26:57 2005 +0000
@@ -570,7 +570,8 @@
 	child = xmlnode_get_child(node, "alias");
 	if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL))
 	{
-		gaim_account_set_alias(ret, data);
+		if (*data != '\0')
+			gaim_account_set_alias(ret, data);
 		g_free(data);
 	}
 
diff -r df67c09ade6e -r e5aa4398003e src/conversation.c
--- a/src/conversation.c	Sat Aug 13 00:49:50 2005 +0000
+++ b/src/conversation.c	Sat Aug 13 02:26:57 2005 +0000
@@ -1316,6 +1316,8 @@
 							who = gaim_buddy_get_contact_alias(b);
 						else if (gaim_connection_get_display_name(gc) != NULL)
 							who = gaim_connection_get_display_name(gc);
+						else
+							who = gaim_account_get_username(account);
 					}
 					else
 						who = gaim_account_get_username(account);