summaryrefslogtreecommitdiff
path: root/sleekxmpp/features
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-10 14:15:55 -0700
committerLance Stout <lancestout@gmail.com>2012-08-10 14:15:55 -0700
commit962dfad2166574955c7be6d12c930991b0f29403 (patch)
tree6a4dd01bd7668bb133814d0e099fed38ef7d08d7 /sleekxmpp/features
parent14aa8311690f3a58ff4b7ad286bcccdd867789f7 (diff)
parentf7a710e55bf433a378dee4bd05f6ceb59f2e9e2d (diff)
downloadslixmpp-962dfad2166574955c7be6d12c930991b0f29403.tar.gz
slixmpp-962dfad2166574955c7be6d12c930991b0f29403.tar.bz2
slixmpp-962dfad2166574955c7be6d12c930991b0f29403.tar.xz
slixmpp-962dfad2166574955c7be6d12c930991b0f29403.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/features')
-rw-r--r--sleekxmpp/features/feature_mechanisms/mechanisms.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/features/feature_mechanisms/mechanisms.py b/sleekxmpp/features/feature_mechanisms/mechanisms.py
index 9a391628..dae2f59f 100644
--- a/sleekxmpp/features/feature_mechanisms/mechanisms.py
+++ b/sleekxmpp/features/feature_mechanisms/mechanisms.py
@@ -109,7 +109,7 @@ class FeatureMechanisms(BasePlugin):
elif value == 'realm':
result[value] = self.xmpp.boundjid.domain
elif value == 'service-name':
- result[value] = self.xmpp.address[0]
+ result[value] = self.xmpp._service_name
elif value == 'service':
result[value] = 'xmpp'
elif value in creds: