Mercurial > libervia-backend

comparison frontends/src/wix/chat.py @ 688:f7878ad3c846

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tools: renamed tools.jid.JID attribute "short" to "bare"
author souliane <souliane@mailoo.org>
date Tue, 29 Oct 2013 16:26:55 +0100
parents 6821fc06a324
children bfabeedbf32e
comparison
equal deleted inserted replaced
687:af0d08a84cc6 688:f7878ad3c846
197 event.Veto() 197 event.Veto()
198 self.Hide() 198 self.Hide()
199 199
200 def onEnterPressed(self, event): 200 def onEnterPressed(self, event):
201 """Behaviour when enter pressed in send line.""" 201 """Behaviour when enter pressed in send line."""
202 self.host.sendMessage(self.target.short if self.type == 'group' else self.target, 202 self.host.sendMessage(self.target.bare if self.type == 'group' else self.target,
203 event.GetString(), 203 event.GetString(),
204 mess_type="groupchat" if self.type == 'group' else "chat", 204 mess_type="groupchat" if self.type == 'group' else "chat",
205 profile_key=self.host.profile) 205 profile_key=self.host.profile)
206 self.textBox.Clear() 206 self.textBox.Clear()
207 207
255 debug(_("Send File")) 255 debug(_("Send File"))
256 filename = wx.FileSelector(_("Choose a file to send"), flags = wx.FD_FILE_MUST_EXIST) 256 filename = wx.FileSelector(_("Choose a file to send"), flags = wx.FD_FILE_MUST_EXIST)
257 if filename: 257 if filename:
258 debug(_("filename: %s"),filename) 258 debug(_("filename: %s"),filename)
259 #FIXME: check last_resource: what if self.target.resource exists ? 259 #FIXME: check last_resource: what if self.target.resource exists ?
260 last_resource = self.host.bridge.getLastResource(unicode(self.target.short), self.host.profile) 260 last_resource = self.host.bridge.getLastResource(unicode(self.target.bare), self.host.profile)
261 if last_resource: 261 if last_resource:
262 full_jid = JID("%s/%s" % (self.target.short, last_resource)) 262 full_jid = JID("%s/%s" % (self.target.bare, last_resource))
263 else: 263 else:
264 full_jid = self.target 264 full_jid = self.target
265 id = self.host.bridge.sendFile(full_jid, filename, {}, self.host.profile) 265 id = self.host.bridge.sendFile(full_jid, filename, {}, self.host.profile)
266 self.host.waitProgress(id, _("File Transfer"), _("Copying %s") % os.path.basename(filename), self.host.profile) 266 self.host.waitProgress(id, _("File Transfer"), _("Copying %s") % os.path.basename(filename), self.host.profile)
267 267