Mercurial > pidgin.yaz
changeset 3799:3163a8825063
[gaim-migrate @ 3941]
fix for untabed conversations and typing notification from faceprint
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Fri, 25 Oct 2002 02:50:59 +0000 |
| parents | 584603e2b257 |
| children | f9b4b1c7d413 |
| files | src/conversation.c |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Thu Oct 24 15:06:24 2002 +0000 +++ b/src/conversation.c Fri Oct 25 02:50:59 2002 +0000 @@ -1808,7 +1808,7 @@ char buf2[BUF_LONG]; char mdate[64]; int unhighlight = 0; - + if (c->is_chat && (!c->gc || !g_slist_find(c->gc->buddy_chats, c))) return; @@ -2042,7 +2042,7 @@ return; if (!(flags & WFLAG_RECV) && !(flags & WFLAG_SYSTEM)) return; - if ((c->unseen == 2) || ((c->unseen == 1) && !(flags & WFLAG_NICK))) + if (im_options & OPT_IM_ONE_WINDOW && ((c->unseen == 2) || ((c->unseen == 1) && !(flags & WFLAG_NICK)))) return; if (flags & WFLAG_RECV)