handle correctly private messages in systray queue

This commit is contained in:
Yann Leboulanger 2006-03-27 21:35:24 +00:00
parent b42bd75a25
commit c0fcdeb116
1 changed files with 5 additions and 4 deletions

View File

@ -1546,10 +1546,11 @@ class Interface:
w = self.msg_win_mgr.get_window(fjid, account) w = self.msg_win_mgr.get_window(fjid, account)
gajim.last_message_time[account][jid] = 0 # long time ago gajim.last_message_time[account][jid] = 0 # long time ago
elif typ == message_control.TYPE_PM: elif typ == message_control.TYPE_PM:
if self.msg_win_mgr.has_window(jid, account): if self.msg_win_mgr.has_window(fjid, account):
w = self.msg_win_mgr.get_window(jid, account) w = self.msg_win_mgr.get_window(fjid, account)
else: else:
room_jid, nick = jid.split('/', 1) room_jid = jid
nick = resource
gc_contact = gajim.contacts.get_gc_contact(account, room_jid, gc_contact = gajim.contacts.get_gc_contact(account, room_jid,
nick) nick)
if gc_contact: if gc_contact:
@ -1560,7 +1561,7 @@ class Interface:
name = nick, show = show) name = nick, show = show)
c = gajim.contacts.contact_from_gc_contact(gc_contact) c = gajim.contacts.contact_from_gc_contact(gc_contact)
self.roster.new_chat(c, account, private_chat = True) self.roster.new_chat(c, account, private_chat = True)
w = self.msg_win_mgr.get_window(jid, account) w = self.msg_win_mgr.get_window(fjid, account)
elif typ in ('normal', 'file-request', 'file-request-error', elif typ in ('normal', 'file-request', 'file-request-error',
'file-send-error', 'file-error', 'file-stopped', 'file-completed'): 'file-send-error', 'file-error', 'file-stopped', 'file-completed'):
# Get the first single message event # Get the first single message event