Carry scheduled kwargs all the way

2 files changed, 3 insertions, 3 deletions

diff --git a/sleekxmpp/xmlstream/scheduler.py b/sleekxmpp/xmlstream/scheduler.py
index b3e50983..bef8f5e5 100644
--- a/sleekxmpp/xmlstream/scheduler.py
+++ b/sleekxmpp/xmlstream/scheduler.py
@@ -76,7 +76,7 @@ class Task(object):
         """
         if self.qpointer is not None:
             self.qpointer.put(('schedule', self.callback,
-                               self.args, self.name))
+                               self.args, self.kwargs, self.name))
         else:
             self.callback(*self.args, **self.kwargs)
         self.reset()
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 55074932..478bd9c0 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -1648,10 +1648,10 @@ class XMLStream(object):
                         log.exception(error_msg, handler.name)
                         orig.exception(e)
                 elif etype == 'schedule':
-                    name = args[1]
+                    name = args[2]
                     try:
                         log.debug('Scheduled event: %s: %s', name, args[0])
-                        handler(*args[0])
+                        handler(*args[0], **args[1])
                     except Exception as e:
                         log.exception('Error processing scheduled task')
                         self.exception(e)