copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIXMEs

This commit is contained in:
Travis Shirk 2006-01-08 00:15:54 +00:00
parent 2e5fe5173b
commit 41be225383
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/roster_window.py
View File

@ -1768,12 +1768,11 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
# We print if window is opened and it's not a single message # We print if window is opened and it's not a single message
if gajim.interface.msg_win_mgr.has_window(jid) and msg_type != 'normal': if gajim.interface.msg_win_mgr.has_window(jid) and msg_type != 'normal':
# FIXME: Remove typ = ''
# typ = '' if msg_type == 'error':
# if msg_type == 'error': typ = 'status'
# typ = 'status'
ctl = gajim.interface.msg_win_mgr.get_control(jid) ctl = gajim.interface.msg_win_mgr.get_control(jid)
ctl.print_conversation(msg, jid, tim = tim, encrypted = encrypted, ctl.print_conversation(msg, typ, tim = tim, encrypted = encrypted,
subject = subject) subject = subject)
return return
@ -1970,11 +1969,13 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
if unrd: if unrd:
unread = True unread = True
break break
for ctl in win.controls(): for ctl in win.controls():
jid = ctl.contact.jid jid = ctl.contact.jid
if time.time() - gajim.last_message_time[acct][jid] < 2: if gajim.last_message_time[acct].has_key(jid):
recent = True if time.time() - gajim.last_message_time[acct][jid] < 2:
break recent = True
break
if unread: if unread:
dialog = dialogs.ConfirmationDialog(_('You have unread messages'), dialog = dialogs.ConfirmationDialog(_('You have unread messages'),
_('Messages will only be available for reading them later if you have history enabled.')) _('Messages will only be available for reading them later if you have history enabled.'))