Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjs <js-gajim@webkeks.org>2008-05-16 19:29:23 +0400
committerjs <js-gajim@webkeks.org>2008-05-16 19:29:23 +0400
commitaaf3ca31619f4826b8a157fdd0b3769db7f9311c (patch)
tree93eaae65c728af0ecca56e2e90870adc2e7a2d7a
parent82f27b27ed1491c8586f0465e48966a00c42114b (diff)
Disable OTR until the libotr devs fix their very broken API.
-rwxr-xr-xsrc/gajim.py28
1 files changed, 20 insertions, 8 deletions
diff --git a/src/gajim.py b/src/gajim.py
index 34a7c66aa..22a24e766 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -256,14 +256,26 @@ from common import dataforms
from common.xmpp import Message as XmppMessage
-try:
- import otr, otr_windows
-
- gajim.otr_module = otr
- gajim.otr_windows = otr_windows
-except ImportError:
- gajim.otr_module = None
- gajim.otr_windows = None
+## We disable OTR for now as libotr's API is just totally broken.
+## If you don't care about losing messages because they were unencrypted
+## and libotr only noticing us via a HTML string about this (which is only
+## displayed as a notice) and don't fear other bugs, you can manually
+## enable it here.
+##
+## OTR will *NOT* be reenabled by default until the developers of libotr
+## fix their very broken API!
+
+#try:
+# import otr, otr_windows
+#
+# gajim.otr_module = otr
+# gajim.otr_windows = otr_windows
+#except ImportError:
+# gajim.otr_module = None
+# gajim.otr_windows = None
+
+gajim.otr_module = None
+gajim.otr_windows = None
def add_appdata(data=None, context=None):
account = data