Mercurial > libervia-backend
diff frontends/src/primitivus/primitivus @ 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 | af0d08a84cc6 |
| children | 56aa0e98c92e |
line wrap: on
line diff
--- a/frontends/src/primitivus/primitivus Mon Oct 28 19:04:49 2013 +0100 +++ b/frontends/src/primitivus/primitivus Tue Oct 29 16:26:55 2013 +0100 @@ -374,13 +374,13 @@ def newMessage(self, from_jid, to_jid, msg, _type, extra, profile): QuickApp.newMessage(self, from_jid, to_jid, msg, _type, extra, profile) - if not from_jid in self.contact_list and from_jid.short != self.profiles[profile]['whoami'].short: + if not from_jid in self.contact_list and from_jid.bare != self.profiles[profile]['whoami'].bare: #XXX: needed to show entities which haven't sent any # presence information and which are not in roster #TODO: put these entities in a "not in roster" list self.contact_list.replace(from_jid) - if JID(self.contact_list.selected).short != from_jid.short: + if JID(self.contact_list.selected).bare != from_jid.bare: self.contact_list.putAlert(from_jid) def _dialogOkCb(self, widget, data): @@ -518,7 +518,7 @@ self.removePopUp() jid=JID(edit.get_edit_text()) if jid.is_valid(): - self.bridge.addContact(jid.short, profile_key=self.profile) + self.bridge.addContact(jid.bare, profile_key=self.profile) else: message = _("'%s' is an invalid JID !") % jid error (message) @@ -623,7 +623,7 @@ self.chat_wins[win].updateChatState(state) return - from_bare = JID(from_jid_s).short + from_bare = JID(from_jid_s).bare if from_bare in self.chat_wins: self.chat_wins[from_bare].updateChatState(state)