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

Last diff was incomplete.

This commit is contained in:
js 2008-07-15 17:04:36 +00:00
parent e01968ef91
commit 6b9bfab6d1
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/chat_control.py
View File

@ -1359,7 +1359,8 @@ class ChatControl(ChatControlBase):
ec.remove(self.contact.jid) ec.remove(self.contact.jid)
self.gpg_is_active = False self.gpg_is_active = False
msg = _('GPG encryption disabled') msg = _('GPG encryption disabled')
ChatControlBase.print_conversation_line(self, msg, 'status', '', None) ChatControlBase.print_conversation_line(self, msg,
'status', '', None)
if self.session: if self.session:
self.session.loggable = True self.session.loggable = True
@ -1368,25 +1369,29 @@ class ChatControl(ChatControlBase):
ec.append(self.contact.jid) ec.append(self.contact.jid)
self.gpg_is_active = True self.gpg_is_active = True
msg = _('GPG encryption enabled') msg = _('GPG encryption enabled')
ChatControlBase.print_conversation_line(self, msg, 'status', '', None) ChatControlBase.print_conversation_line(self, msg,
'status', '', None)
if self.session: if self.session:
self.session.loggable = gajim.config.get('log_encrypted_sessions'); self.session.loggable = gajim.config.get(
'log_encrypted_sessions');
if self.session and not self.session.is_loggable(): if self.session and not self.session.is_loggable():
msg = _('Session WILL NOT be logged') msg = _('Session WILL NOT be logged')
else: else:
msg = _('Session WILL be logged') msg = _('Session WILL be logged')
ChatControlBase.print_conversation_line(self, msg, 'status', '', None) ChatControlBase.print_conversation_line(self, msg,
'status', '', None)
gpg_pref = gajim.config.get_per('contacts', self.contact.jid, gpg_pref = gajim.config.get_per('contacts', self.contact.jid,
'gpg_enabled') 'gpg_enabled')
if gpg_pref is None: if gpg_pref is None:
gajim.config.add_per('contacts', self.contact.jid) gajim.config.add_per('contacts', self.contact.jid)
gajim.config.set_per('contacts', self.contact.jid, 'gpg_enabled', gajim.config.set_per('contacts', self.contact.jid,
self.gpg_is_active) 'gpg_enabled', self.gpg_is_active)
self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, self.session and \ self._show_lock_image(self.gpg_is_active, 'GPG',
self.session.is_loggable(), self.session and self.session.verified_identity) self.gpg_is_active,
self.session and self.session.is_loggable(), True)
def _show_lock_image(self, visible, enc_type = '', enc_enabled = False, chat_logged = False, authenticated = False): def _show_lock_image(self, visible, enc_type = '', enc_enabled = False, chat_logged = False, authenticated = False):
'''Set lock icon visibility and create tooltip''' '''Set lock icon visibility and create tooltip'''