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:
authorPhilipp Hörist <philipp@hoerist.com>2018-11-11 12:40:48 +0300
committerPhilipp Hörist <philipp@hoerist.com>2018-11-13 23:56:21 +0300
commit5981396ac4186698ce535f7a6d953147845c4103 (patch)
treee1df30e78605b117b2c376a98ef49d7f806c83b5
parent510985d7c435b7a255eacd5a89ee386e21cac060 (diff)
Pass account to plugins when encrypting a file
-rw-r--r--gajim/common/modules/httpupload.py2
-rw-r--r--gajim/gui_interface.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/gajim/common/modules/httpupload.py b/gajim/common/modules/httpupload.py
index 97f16987f..1cb6aaa13 100644
--- a/gajim/common/modules/httpupload.py
+++ b/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)
diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py
index 07527541c..e62646ac4 100644
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -1141,13 +1141,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))