# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1126287343 0
# Node ID 67abb500f600139846b94eb6216c367309870fa5
# Parent  36f575351c4958d0fd2d2e3bdec1e8ccb80632d6
[gaim-migrate @ 13720]
Room join notices (for the user's account) were showing (null) when the user didn't have an account alias set. It's fixed now.

committer: Tailor Script <tailor@pidgin.im>

diff -r 36f575351c49 -r 67abb500f600 src/conversation.c
--- a/src/conversation.c	Fri Sep 09 12:34:27 2005 +0000
+++ b/src/conversation.c	Fri Sep 09 17:35:43 2005 +0000
@@ -1985,7 +1985,6 @@
 
 		if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) {
 			char *tmp;
-			GaimBuddy *buddy;
 
 			if (prpl_info->options & OPT_PROTO_USE_DISPLAY_NAME_FOR_ME_IN_CHATS)
 				tmp = g_strdup(gaim_normalize(conv->account, gc->display_name));
@@ -1993,10 +1992,17 @@
 				tmp = g_strdup(gaim_normalize(conv->account, conv->account->username));
 
 			if (!strcmp(tmp, gaim_normalize(conv->account, user))) {
-				alias = gaim_account_get_alias(conv->account);
-				if (alias == NULL)
-					alias = gaim_connection_get_display_name(gc);
+				const char *alias2 = gaim_account_get_alias(conv->account);
+				if (alias2 != NULL)
+					alias = alias2;
+				else
+				{
+					const char *display_name = gaim_connection_get_display_name(gc);
+					if (display_name != NULL)
+						alias = display_name;
+				}
 			} else {
+				GaimBuddy *buddy;
 				if ((buddy = gaim_find_buddy(gc->account, user)) != NULL)
 					alias = gaim_buddy_get_contact_alias(buddy);
 			}