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

fix encrypted/unencrypted notifications in PM

This commit is contained in:
Brendan Taylor 2008-07-14 23:46:22 +00:00
parent d541b42236
commit 15567aa113
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/events.py
View File

@ -36,7 +36,7 @@ class Event:
file-request-error, file-send-error, file-stopped, gc_msg, pm, file-request-error, file-send-error, file-stopped, gc_msg, pm,
printed_chat, printed_gc_msg, printed_marked_gc_msg, printed_pm printed_chat, printed_gc_msg, printed_marked_gc_msg, printed_pm
parameters is (per type_): parameters is (per type_):
chat, normal: [message, subject, kind, time, encrypted, resource, chat, normal, pm: [message, subject, kind, time, encrypted, resource,
msg_id] msg_id]
where kind in error, incoming where kind in error, incoming
file-*: file_props file-*: file_props

10
src/groupchat_control.py
View File

@ -645,18 +645,14 @@ class GroupchatControl(ChatControlBase):
else: else:
self.print_conversation(msg, nick, tim, xhtml) self.print_conversation(msg, nick, tim, xhtml)
def on_private_message(self, nick, msg, tim, xhtml, session, msg_id = None): def on_private_message(self, nick, msg, tim, xhtml, session,
msg_id = None, encrypted = False):
# Do we have a queue? # Do we have a queue?
fjid = self.room_jid + '/' + nick fjid = self.room_jid + '/' + nick
no_queue = len(gajim.events.get_events(self.account, fjid)) == 0 no_queue = len(gajim.events.get_events(self.account, fjid)) == 0
# We print if window is opened
if session.control:
session.control.print_conversation(msg, tim = tim, xhtml = xhtml)
return
event = gajim.events.create_event('pm', (msg, '', 'incoming', tim, event = gajim.events.create_event('pm', (msg, '', 'incoming', tim,
False, '', msg_id, xhtml, session)) encrypted, '', msg_id, xhtml, session))
gajim.events.add_event(self.account, fjid, event) gajim.events.add_event(self.account, fjid, event)
autopopup = gajim.config.get('autopopup') autopopup = gajim.config.get('autopopup')

10
src/session.py
View File

@ -188,8 +188,14 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
if pm: if pm:
nickname = resource nickname = resource
groupchat_control.on_private_message(nickname, msgtxt, tim, if self.control:
xhtml, self, msg_id) # print if a control is open
self.control.print_conversation(msgtxt,
tim = tim, xhtml = xhtml, encrypted = encrypted)
else:
# otherwise pass it off to the control to be queued
groupchat_control.on_private_message(nickname, msgtxt, tim,
xhtml, self, msg_id=msg_id, encrypted=encrypted)
else: else:
self.roster_message(jid, msgtxt, tim, encrypted, msg_type, self.roster_message(jid, msgtxt, tim, encrypted, msg_type,
subject, resource, msg_id, user_nick, advanced_notif_num, subject, resource, msg_id, user_nick, advanced_notif_num,