diff options
| author | Philipp Hörist <forenjunkie@chello.at> | 2017-07-17 18:50:26 +0300 |
|---|---|---|
| committer | Philipp Hörist <forenjunkie@chello.at> | 2017-07-17 18:50:26 +0300 |
| commit | cebea4a382c6130a746455803a85c1300cae70f8 (patch) | |
| tree | 942451d5c7cfcced08fb77317d14597d742d74f4 | |
| parent | aecbfec2b1a8e45ee0c0ca92ce1d41e5d5b54707 (diff) | |
[omemo] Raise min version to 0.16.6
| -rw-r--r-- | omemo/manifest.ini | 2 | ||||
| -rw-r--r-- | omemo/omemoplugin.py | 30 |
2 files changed, 12 insertions, 20 deletions
diff --git a/omemo/manifest.ini b/omemo/manifest.ini index 7871aa6..84563a9 100644 --- a/omemo/manifest.ini +++ b/omemo/manifest.ini @@ -7,5 +7,5 @@ authors: Bahtiar `kalkin-` Gadimov <bahtiar@gadimov.de> Daniel Gultsch <daniel@gultsch.de> Philipp Hörist <philipp@hoerist.com> homepage: https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin -min_gajim_version: 0.16.5 +min_gajim_version: 0.16.6 max_gajim_version: 0.16.9 diff --git a/omemo/omemoplugin.py b/omemo/omemoplugin.py index 7a13445..60380a0 100644 --- a/omemo/omemoplugin.py +++ b/omemo/omemoplugin.py @@ -49,8 +49,7 @@ CRYPTOGRAPHY_MISSING = 'You are missing Python-Cryptography' AXOLOTL_MISSING = 'You are missing Python-Axolotl or use an outdated version' PROTOBUF_MISSING = 'OMEMO cant import Google Protobuf, you can find help in ' \ 'the GitHub Wiki' -GAJIM_VERSION = 'OMEMO only works with the latest Gajim version, get the ' \ - 'latest version from gajim.org' +GAJIM_VERSION = 'Your Gajim version is to old, OMEMO needs 0.16.6 or higher' ERROR_MSG = '' NS_HINTS = 'urn:xmpp:hints' @@ -87,7 +86,6 @@ if not ERROR_MSG: ERROR_MSG = 'Error: ' + str(e) GAJIM_VER = gajim.config.get('version') -GROUPCHAT = False if os.name != 'nt': try: @@ -99,14 +97,8 @@ if os.name != 'nt': ERROR_MSG = 'You are missing the Setuptools package.' if not SETUPTOOLS_MISSING: - if pkg.parse_version(GAJIM_VER) < pkg.parse_version('0.16.5'): + if pkg.parse_version(GAJIM_VER) < pkg.parse_version('0.16.6'): ERROR_MSG = GAJIM_VERSION - if pkg.parse_version(GAJIM_VER) > pkg.parse_version('0.16.5'): - GROUPCHAT = True -else: - # if GAJIM_VER < 0.16.5, the Plugin fails on missing dependencys earlier - if not GAJIM_VER == '0.16.5': - GROUPCHAT = True # pylint: disable=no-init # pylint: disable=attribute-defined-outside-init @@ -149,15 +141,15 @@ class OmemoPlugin(GajimPlugin): (ged.PRECORE, self.handle_outgoing_stanza), 'message-outgoing': (ged.PRECORE, self.handle_outgoing_event)} - if GROUPCHAT: - self.events_handlers['gc-stanza-message-outgoing'] =\ - (ged.PRECORE, self.handle_outgoing_gc_stanza) - self.events_handlers['gc-presence-received'] =\ - (ged.PRECORE, self.gc_presence_received) - self.events_handlers['gc-config-changed-received'] =\ - (ged.PRECORE, self.gc_config_changed_received) - self.events_handlers['muc-admin-received'] =\ - (ged.PRECORE, self.room_memberlist_received) + + self.events_handlers['gc-stanza-message-outgoing'] =\ + (ged.PRECORE, self.handle_outgoing_gc_stanza) + self.events_handlers['gc-presence-received'] =\ + (ged.PRECORE, self.gc_presence_received) + self.events_handlers['gc-config-changed-received'] =\ + (ged.PRECORE, self.gc_config_changed_received) + self.events_handlers['muc-admin-received'] =\ + (ged.PRECORE, self.room_memberlist_received) self.config_dialog = OMEMOConfigDialog(self) self.gui_extension_points = {'chat_control': (self.connect_ui, |