Merge branch 'develop'

2013-02-25 09:53:35 -08:00
parent 9a45ebd98b a1d71d31e8
commit 82bbe5d1a6
8 changed files with 22 additions and 21 deletions
--- 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):