fixed setValues messed up merge

sleekxmpp/__init__.py

@@ -80,10 +80,12 @@ def __getitem__(self, key):
 	def get(self, key, default):
 		return self.plugin.get(key, default)
 
-	def connect(self, host=None, port=None):
+	def connect(self, address=None):
 		"""Connect to the Jabber Server.  Attempts SRV lookup, and if it fails, uses
 		the JID server.  You can optionally specify a host/port if you're not using 
 		DNS and want to connect to a server address that is different from the XMPP domain."""
+		if address:
+			host, port = address
 
 		if self.state['connected']: return True
 

sleekxmpp/basexmpp.py

@@ -154,20 +154,20 @@ def makeIq(self, id=0, ifrom=None):
 	def makeIqGet(self, queryxmlns = None):
 		# TODO this should take a 'to' param since more often than not you set 
 		# iq['to']=whatever immediately after.
-		iq = self.Iq().setValues({'type': 'get'})
+		iq = self.Iq().setStanzaValues({'type': 'get'})
 		if queryxmlns:
 			iq.append(ET.Element("{%s}query" % queryxmlns))
 		return iq
 
 	def makeIqResult(self, id):
 		# TODO this should take a 'to' param since more often than not you set 
 		# iq['to']=whatever immediately after.
-		return self.Iq().setValues({'id': id, 'type': 'result'})
+		return self.Iq().setStanzaValues({'id': id, 'type': 'result'})
 
 	def makeIqSet(self, sub=None):
 		# TODO this should take a 'to' param since more often than not you set 
 		# iq['to']=whatever immediately after.
-		iq = self.Iq().setValues({'type': 'set'})
+		iq = self.Iq().setStanzaValues({'type': 'set'})
 		if sub != None:
 			iq.append(sub)
 		return iq