X-Git-Url: https://code.delx.au/pymsnt/blobdiff_plain/f3c0541ec9baf3be95cd24b54f2844f1e1b51d93..5921d694e4dd3f8471745fa99e68cada51fa7182:/src/legacy/glue.py diff --git a/src/legacy/glue.py b/src/legacy/glue.py index 9158dbe..b6947f3 100644 --- a/src/legacy/glue.py +++ b/src/legacy/glue.py @@ -18,7 +18,7 @@ import lang url = "http://msn-transport.jabberstudio.org" -version = "0.11-dev" # The transport version +version = "0.11.1" # The transport version mangle = True # XDB '@' -> '%' mangling id = "msn" # The transport identifier @@ -36,6 +36,7 @@ defaultAvatar = avatar.AvatarCache().setAvatar(defaultAvatarData) def reloadConfig(): msn.MSNConnection.GETALLAVATARS = config.getAllAvatars + msn.setDebug(config._debugLevel >= 4) def isGroupJID(jid): """ Returns True if the JID passed is a valid groupchat JID (for MSN, does not contain '%') """ @@ -108,10 +109,10 @@ def msn2jid(msnid, withResource): else: if msnid.startswith("tel:+"): msnid = msnid.replace("tel:+", "") + "%tel" - jid = msnid.replace('@', '%') + "@" + config.jid + (withResource and "/msn" or "") + jid = msnid.replace('@', '%') + "@" + config.jid msn2jid_cache[msnid] = jid jid2msn_cache[jid] = msnid - return jid + return msn2jid(msnid, withResource) # Marks this as the function to be used in jabber:iq:gateway (Service ID Translation) def translateAccount(msnid):