From e3a5211b6d7935575a9fcb292ffd8196e3def076 Mon Sep 17 00:00:00 2001
From: Nathan Fritz <fritzy@netflint.net>
Date: Mon, 19 Oct 2009 05:27:00 +0000
Subject: [PATCH] * fixes

---
 sleekxmpp/plugins/xep_0004.py           | 2 +-
 sleekxmpp/xmlstream/handler/callback.py | 2 ++
 sleekxmpp/xmlstream/handler/waiter.py   | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sleekxmpp/plugins/xep_0004.py b/sleekxmpp/plugins/xep_0004.py
index cbc0a23..678b266 100644
--- a/sleekxmpp/plugins/xep_0004.py
+++ b/sleekxmpp/plugins/xep_0004.py
@@ -100,7 +100,7 @@ class Form(FieldContainer):
 		form1.fromXML(self.getXML(self.type))
 		for field in form2.fields:
 			if not field.var in form1.fields:
-				form1.addField(field.var, field.type, field.label, field.desc, field.required, field.value):
+				form1.addField(field.var, field.type, field.label, field.desc, field.required, field.value)
 			else:
 				form1.fields[field.var].value = field.value
 			for option, label in field.options:
diff --git a/sleekxmpp/xmlstream/handler/callback.py b/sleekxmpp/xmlstream/handler/callback.py
index c618b71..dd50726 100644
--- a/sleekxmpp/xmlstream/handler/callback.py
+++ b/sleekxmpp/xmlstream/handler/callback.py
@@ -1,4 +1,5 @@
 from . import base
+import logging
 
 class Callback(base.BaseHandler):
 	
@@ -15,6 +16,7 @@ class Callback(base.BaseHandler):
 			self.run(payload, True)
 	
 	def run(self, payload, instream=False):
+		logging.debug("Running %s in %s" % (self.name, self._pointer))
 		if not self._instream or instream:
 			base.BaseHandler.run(self, payload)
 			#if self._thread:
diff --git a/sleekxmpp/xmlstream/handler/waiter.py b/sleekxmpp/xmlstream/handler/waiter.py
index e62f330..2c91052 100644
--- a/sleekxmpp/xmlstream/handler/waiter.py
+++ b/sleekxmpp/xmlstream/handler/waiter.py
@@ -9,15 +9,18 @@ class Waiter(base.BaseHandler):
 		self._payload = queue.Queue()
 	
 	def prerun(self, payload):
+		logging.debug("Putting into Waiter %s" % self.name)
 		self._payload.put(payload)
 	
 	def run(self, payload):
 		pass
 
 	def wait(self, timeout=60):
+		logging.debug("Waiting on %s." % self.name)
 		try:
 			return self._payload.get(True, timeout)
 		except queue.Empty:
+			logging.warning("Timed out waiting for %s" % self.name)
 			return False
 	
 	def checkDelete(self):