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

More logical meaning of first message for a single message (if no single already in queue for this jid) 

Fixed possible bad value of first for pm
Slaped bad bad comments
This commit is contained in:
Jean-Marie Traissard 2006-11-03 07:58:44 +00:00
parent b978097c42
commit ea496bdace
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/events.py
View File

@ -81,7 +81,7 @@ class Events:
gajim.interface.systray.set_img()
def remove_events(self, account, jid, event = None, types = []):
'''if event is not speficied, remove all events from this jid,
'''if event is not specified, remove all events from this jid,
optionnaly only from given type
return True if no such event found'''
if not self._events.has_key(account):
@ -122,7 +122,7 @@ class Events:
return self._get_nb_events(types = types)
def get_events(self, account, jid = None, types = []):
'''if event is not speficied, remove all events from this jid,
'''if event is not specified, get all events from this jid,
optionnaly only from given type'''
if not self._events.has_key(account):
return []

10
src/gajim.py
View File

@ -522,6 +522,7 @@ class Interface:
message_control.TYPE_GC:
# It's a Private message
pm = True
msg_type = 'pm'
chat_control = None
jid_of_control = full_jid_with_resource
@ -583,14 +584,15 @@ class Interface:
# Is it a first or next message received ?
first = False
if not chat_control and not gajim.events.get_events(account,
jid_of_control, ['chat']):
# It's a first message and not a Private Message
if msg_type == 'normal':
if not gajim.events.get_events(account,jid, ['normal']):
first = True
elif not chat_control and not gajim.events.get_events(account,
jid_of_control, [msg_type]): # msg_type can be chat or pm
first = True
if pm:
nickname = resource
msg_type = 'pm'
groupchat_control.on_private_message(nickname, message, array[2],
xhtml)
else: