Scheduler waits too longer, and pubsubstate registration was backwards

sleekxmpp/plugins/stanza_pubsub.py

@@ -40,8 +40,8 @@ class PubsubStateEvent(ElementBase):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(Message, PubsubState)
-stanzaPlugin(PubsubState, PubsubStateEvent)
+stanzaPlugin(Message, PubsubStateEvent)
+stanzaPlugin(PubsubStateEvent, PubsubState)
 
 class Pubsub(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub'

sleekxmpp/xmlstream/scheduler.py

@@ -49,7 +49,7 @@ class Scheduler(object):
 		self.run = True
 		while self.run:
 			try:
-				wait = 5
+				wait = 1
 				updated = False
 				if self.schedule:
 					wait = self.schedule[0].next - time.time()

sleekxmpp/xmlstream/stanzabase.py

@@ -78,6 +78,9 @@ class ElementBase(tostring.ToString):
 	def __iter__(self):
 		self.idx = 0
 		return self
+
+	def __bool__(self):
+		return True
 	
 	def __next__(self):
 		self.idx += 1