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

Pull correct security catalog for private messages

This commit is contained in:
Philipp Hörist 2018-10-04 14:27:45 +02:00
parent 14bad789d6
commit 7ece7dbaff
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gajim/chat_control_base.py
View File

@ -179,13 +179,21 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
# text to show is in in first column of liststore # text to show is in in first column of liststore
self.seclabel_combo.add_attribute(cell, 'text', 0) self.seclabel_combo.add_attribute(cell, 'text', 0)
con = app.connections[self.account] con = app.connections[self.account]
jid = self.contact.jid
if self.TYPE_ID == 'pm':
jid = self.gc_contact.room_jid
if con.get_module('SecLabels').supported: if con.get_module('SecLabels').supported:
con.get_module('SecLabels').request_catalog(self.contact.jid) con.get_module('SecLabels').request_catalog(jid)
def _sec_labels_received(self, event): def _sec_labels_received(self, event):
if event.account != self.account: if event.account != self.account:
return return
if event.jid != self.contact.jid:
jid = self.contact.jid
if self.TYPE_ID == 'pm':
jid = self.gc_contact.room_jid
if event.jid != jid:
return return
model = self.seclabel_combo.get_model() model = self.seclabel_combo.get_model()
model.clear() model.clear()
@ -765,7 +773,10 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
return return
con = app.connections[self.account] con = app.connections[self.account]
catalog = con.get_module('SecLabels').get_catalog(self.contact.jid) jid = self.contact.jid
if self.TYPE_ID == 'pm':
jid = self.gc_contact.room_jid
catalog = con.get_module('SecLabels').get_catalog(jid)
labels, label_list, _ = catalog labels, label_list, _ = catalog
lname = label_list[idx] lname = label_list[idx]
label = labels[lname] label = labels[lname]