changeset 1851:ff603003d40a

plugin misc_upload: fixes things that have been forgotten after a refactoring
author souliane <souliane@mailoo.org>
date Tue, 23 Feb 2016 15:02:03 +0100
parents 6e547dd7f38c
children 569c48e4cf0d
files src/plugins/plugin_misc_upload.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/plugin_misc_upload.py	Mon Feb 22 14:33:47 2016 +0100
+++ b/src/plugins/plugin_misc_upload.py	Tue Feb 23 15:02:03 2016 +0100
@@ -67,7 +67,6 @@
 
         return self.fileUpload(client, filepath, filename or None, upload_jid, options or None)
 
-    @defer.inlineCallbacks
     def fileUpload(self, client, filepath, filename, upload_jid, options):
         """Send a file using best available method
 
@@ -83,7 +82,7 @@
             log.warning(msg)
             return {'xmlui': xml_tools.note(u"Can't upload file", msg, C.XMLUI_DATA_LVL_WARNING).toXml()}
 
-        d = self.upload(filepath, filename, upload_jid, options, client.profile)
+        d = self.upload(client, filepath, filename, upload_jid, options)
         d.addCallback(uploadCb)
         d.addErrback(uploadEb)
         return d