Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gajim-plugins
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
51
Issues
51
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gajim
gajim-plugins
Commits
cebea4a3
Commit
cebea4a3
authored
Jul 17, 2017
by
Philipp Hörist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[omemo] Raise min version to 0.16.6
parent
aecbfec2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
20 deletions
+12
-20
manifest.ini
omemo/manifest.ini
+1
-1
omemoplugin.py
omemo/omemoplugin.py
+11
-19
No files found.
omemo/manifest.ini
View file @
cebea4a3
...
...
@@ -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
omemo/omemoplugin.py
View file @
cebea4a3
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment