Mercurial > pidgin
diff src/conversation.c @ 11468:c3cb62d33f53
[gaim-migrate @ 13708]
Fixing a crash with Jabber that I introduced.
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Thu, 08 Sep 2005 22:22:39 +0000 |
parents | 201617d49573 |
children | 67abb500f600 |
line wrap: on
line diff
--- a/src/conversation.c Thu Sep 08 17:47:51 2005 +0000 +++ b/src/conversation.c Thu Sep 08 22:22:39 2005 +0000 @@ -1276,7 +1276,7 @@ GaimConnection *gc = NULL; GaimAccount *account; GaimConversationUiOps *ops; - const char *alias = NULL; + const char *alias; GaimConvWindow *win; GaimBuddy *b; GaimUnseenState unseen; @@ -1303,6 +1303,11 @@ !g_list_find(gaim_get_conversations(), conv)) return; + if (who == NULL || *who == '\0') + who = gaim_conversation_get_name(conv); + + alias = who; + if (account != NULL) { prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(account))); @@ -1324,15 +1329,10 @@ } else { - if (who == NULL || *who == '\0') - who = gaim_conversation_get_name(conv); - b = gaim_find_buddy(account, who); if (b != NULL) alias = gaim_buddy_get_contact_alias(b); - else - alias = who; } } }