Philipp Hörist pushed to branch master at gajim / gajim
Commits:
62b210a9 by Philipp Hörist at 2018-11-11T09:40:48Z
Pass account to plugins when encrypting a file
- - - - -
2 changed files:
- gajim/common/modules/httpupload.py
- gajim/gui_interface.py
Changes:
=====================================
gajim/common/modules/httpupload.py
=====================================
@@ -167,7 +167,7 @@ class HTTPUpload:
return
if encryption is not None:
- app.interface.encrypt_file(file, self._request_slot)
+ app.interface.encrypt_file(file, self._account, self._request_slot)
else:
self._request_slot(file)
=====================================
gajim/gui_interface.py
=====================================
@@ -1136,13 +1136,13 @@ class Interface:
chat_control.session,
groupchat)
- def encrypt_file(self, file, callback):
+ def encrypt_file(self, file, account, callback):
app.nec.push_incoming_event(HTTPUploadProgressEvent(
None, status='encrypt', file=file))
encryption = file.encryption
plugin = app.plugin_manager.encryption_plugins[encryption]
if hasattr(plugin, 'encrypt_file'):
- plugin.encrypt_file(file, None, callback)
+ plugin.encrypt_file(file, account, callback)
else:
app.nec.push_incoming_event(HTTPUploadProgressEvent(
None, status='close', file=file))
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/62b210a9e5db79413ca1eef90b74698d3357ccfa
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/62b210a9e5db79413ca1eef90b74698d3357ccfa
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
