Mercurial > pidgin.yaz
diff src/conversation.c @ 1772:896432d66303
[gaim-migrate @ 1782]
remove OPT_USR_KEEPALIVE; add OPT_PROTO_UNIQUE_CHATNAME for Jabber. other things that need to be implemented still.
committer: Tailor Script <tailor@pidgin.im>
author | Eric Warmenhoven <eric@warmenhoven.org> |
---|---|
date | Mon, 30 Apr 2001 01:58:24 +0000 |
parents | 1e0613d9526b |
children | d7cbedd1d651 |
line wrap: on
line diff
--- a/src/conversation.c Mon Apr 30 01:25:30 2001 +0000 +++ b/src/conversation.c Mon Apr 30 01:58:24 2001 +0000 @@ -1296,24 +1296,26 @@ if (!(logging_options & OPT_LOG_STRIP_HTML)) gtk_font_options = gtk_font_options ^ GTK_IMHTML_RETURN_LOG; - if (!who) { - if (flags & WFLAG_SEND) { - b = find_buddy(c->gc, c->gc->username); + if (!c->is_chat || !(c->gc->prpl->options & OPT_PROTO_UNIQUE_CHATNAME)) { + if (!who) { + if (flags & WFLAG_SEND) { + b = find_buddy(c->gc, c->gc->username); + if (b) + who = b->show; + else + who = c->gc->username; + } else { + b = find_buddy(c->gc, c->name); + if (b) + who = b->show; + else + who = c->name; + } + } else { + b = find_buddy(c->gc, who); if (b) who = b->show; - else - who = c->gc->username; - } else { - b = find_buddy(c->gc, c->name); - if (b) - who = b->show; - else - who = c->name; } - } else { - b = find_buddy(c->gc, who); - if (b) - who = b->show; }