summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/xmlstream.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-02-22 10:08:35 -0800
committerLance Stout <lancestout@gmail.com>2013-02-22 10:08:35 -0800
commita1d71d31e85df2cf6efc835c30592126ca9861f2 (patch)
treef873e2610061011308f38baff46dac54316e11bb /sleekxmpp/xmlstream/xmlstream.py
parent766e0b685d7d13adbcaa6e475c03b3ba96c196b2 (diff)
parent58f5e4702b143208bc80f8a507b358f2c2b1745d (diff)
downloadslixmpp-a1d71d31e85df2cf6efc835c30592126ca9861f2.tar.gz
slixmpp-a1d71d31e85df2cf6efc835c30592126ca9861f2.tar.bz2
slixmpp-a1d71d31e85df2cf6efc835c30592126ca9861f2.tar.xz
slixmpp-a1d71d31e85df2cf6efc835c30592126ca9861f2.zip
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 3f87df52..289e3a21 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -1015,8 +1015,8 @@ class XMLStream(object):
# and handler classes here.
if name is None:
- name = 'add_handler_%s' % self.getNewId()
- self.registerHandler(XMLCallback(name, MatchXMLMask(mask), pointer,
+ name = 'add_handler_%s' % self.new_id()
+ self.register_handler(XMLCallback(name, MatchXMLMask(mask), pointer,
once=disposable, instream=instream))
def register_handler(self, handler, before=None, after=None):