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

don't automatically start esessions, at least until we get caps sorted out

This commit is contained in:
Brendan Taylor 2008-07-14 05:00:57 +00:00
parent a407414dd9
commit 7ff17b7e1f
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/chat_control.py
View File

@ -45,7 +45,7 @@ from common.contacts import GC_Contact
from common.logger import Constants from common.logger import Constants
constants = Constants() constants = Constants()
from common.rst_xhtml_generator import create_xhtml from common.rst_xhtml_generator import create_xhtml
from common.xmpp.protocol import NS_XHTML, NS_FILE, NS_MUC, NS_ESESSION from common.xmpp.protocol import NS_XHTML, NS_FILE, NS_MUC
try: try:
import gtkspell import gtkspell
@ -1144,9 +1144,6 @@ class ChatControl(ChatControlBase):
self.session.loggable = gajim.config.get('log_encrypted_sessions') self.session.loggable = gajim.config.get('log_encrypted_sessions')
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.gpg_is_active, self.session and \
self.session.is_loggable(), self.session and self.session.verified_identity) self.session.is_loggable(), self.session and self.session.verified_identity)
# then try E2E
elif not e2e_is_active and gajim.capscache.is_supported(contact, NS_ESESSION):
self.begin_e2e_negotiation()
self.status_tooltip = gtk.Tooltips() self.status_tooltip = gtk.Tooltips()
@ -1809,8 +1806,7 @@ class ChatControl(ChatControlBase):
toggle_gpg_menuitem.set_active(self.gpg_is_active) toggle_gpg_menuitem.set_active(self.gpg_is_active)
# disable esessions if we or the other client don't support them # disable esessions if we or the other client don't support them
if not gajim.HAVE_PYCRYPTO or \ if not gajim.HAVE_PYCRYPTO:
not gajim.capscache.is_supported(contact, NS_ESESSION):
toggle_e2e_menuitem.set_sensitive(False) toggle_e2e_menuitem.set_sensitive(False)
else: else:
toggle_e2e_menuitem.set_active(e2e_is_active) toggle_e2e_menuitem.set_active(e2e_is_active)