diff frontends/src/jp/jp @ 688:f7878ad3c846

tools: renamed tools.jid.JID attribute "short" to "bare"
author souliane <souliane@mailoo.org>
date Tue, 29 Oct 2013 16:26:55 +0100
parents 09bbd5c00244
children 3954cb4d96a7
line wrap: on
line diff
--- a/frontends/src/jp/jp	Mon Oct 28 19:04:49 2013 +0100
+++ b/frontends/src/jp/jp	Tue Oct 29 16:26:55 2013 +0100
@@ -321,7 +321,7 @@
             #if the resource is not given, we try to add the last known resource
             last_resource = self.bridge.getLastResource(param_jid, self.options.profile)
             if last_resource:
-                return "%s/%s" % (_jid.short, last_resource)
+                return "%s/%s" % (_jid.bare, last_resource)
         return param_jid
 
 
@@ -334,7 +334,7 @@
         if confirm_type == "FILE_TRANSFER":
             if not self.options.wait_file:
                 return
-            if self.dest_jids and not JID(data['from']).short in [JID(_jid).short for _jid in self.dest_jids]:
+            if self.dest_jids and not JID(data['from']).bare in [JID(_jid).bare for _jid in self.dest_jids]:
                 return #file is not sent by a filtered jid
 
             answer_data["dest_path"] = os.getcwd()+'/'+data['filename']
@@ -354,7 +354,7 @@
         elif confirm_type == "PIPE_TRANSFER":
             if not self.options.pipe_in:
                 return
-            if self.dest_jids and not JID(data['from']).short in [JID(_jid).short for _jid in self.dest_jids]:
+            if self.dest_jids and not JID(data['from']).bare in [JID(_jid).bare for _jid in self.dest_jids]:
                 return #pipe stream is not sent by a filtered jid
 
             tmp_dir = tempfile.mkdtemp()