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

fjid ==> full_jid so we can distinguish it from fjid (which should progressively become fake_jid)

This commit is contained in:
Nikos Kouremenos 2006-04-04 17:21:38 +00:00
parent cdf325d477
commit d7e6979887
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/chat_control.py
View File

@ -431,7 +431,7 @@ class ChatControlBase(MessageControl):
other_tags_for_text = [], count_as_new = True, subject = None):
'''prints 'chat' type messages'''
jid = self.contact.jid
fjid = self.get_full_jid()
full_jid = self.get_full_jid()
textview = self.conv_textview
end = False
if textview.at_the_end() or kind == 'outgoing':
@ -442,18 +442,18 @@ class ChatControlBase(MessageControl):
if not count_as_new:
return
if kind == 'incoming':
gajim.last_message_time[self.account][fjid] = time.time()
gajim.last_message_time[self.account][full_jid] = time.time()
urgent = True
if (not self.parent_win.get_active_jid() or \
fjid != self.parent_win.get_active_jid() or \
full_jid != self.parent_win.get_active_jid() or \
not self.parent_win.is_active() or not end) and \
kind in ('incoming', 'incoming_queue'):
self.nb_unread += 1
if gajim.interface.systray_enabled and self.notify_on_new_messages():
gajim.interface.systray.add_jid(fjid, self.account, self.type_id)
gajim.interface.systray.add_jid(full_jid, self.account, self.type_id)
self.parent_win.redraw_tab(self)
if not self.parent_win.is_active():
ctrl = gajim.interface.msg_win_mgr.get_control(fjid,
ctrl = gajim.interface.msg_win_mgr.get_control(full_jid,
self.account)
self.parent_win.show_title(urgent, ctrl)