tools: renamed tools.jid.JID attribute "short" to "bare"
This commit is contained in:
parent
a154d9acbb
commit
36cea6fc91
1 changed files with 94 additions and 94 deletions
|
|
@ -199,7 +199,7 @@ class Chat(wx.Frame, QuickChat):
|
|||
|
||||
def onEnterPressed(self, event):
|
||||
"""Behaviour when enter pressed in send line."""
|
||||
self.host.sendMessage(self.target.short if self.type == 'group' else self.target,
|
||||
self.host.sendMessage(self.target.bare if self.type == 'group' else self.target,
|
||||
event.GetString(),
|
||||
mess_type="groupchat" if self.type == 'group' else "chat",
|
||||
profile_key=self.host.profile)
|
||||
|
|
@ -257,9 +257,9 @@ class Chat(wx.Frame, QuickChat):
|
|||
if filename:
|
||||
debug(_("filename: %s"),filename)
|
||||
#FIXME: check last_resource: what if self.target.resource exists ?
|
||||
last_resource = self.host.bridge.getLastResource(unicode(self.target.short), self.host.profile)
|
||||
last_resource = self.host.bridge.getLastResource(unicode(self.target.bare), self.host.profile)
|
||||
if last_resource:
|
||||
full_jid = JID("%s/%s" % (self.target.short, last_resource))
|
||||
full_jid = JID("%s/%s" % (self.target.bare, last_resource))
|
||||
else:
|
||||
full_jid = self.target
|
||||
id = self.host.bridge.sendFile(full_jid, filename, {}, self.host.profile)
|
||||
|
|
|
|||
Loading…
Reference in a new issue