# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1286759012 -3600
# Node ID 386920f058089d7ea12cd7aeffbd4b95d5225809
# Parent  c95b84ed366b086260b9caad0fcb411e3fcdeecc# Parent  96efa9ee8f18741dae231273a1f3a5c21fed0e59
Merge

diff -r 96efa9ee8f18 -r 386920f05808 plugins/disco.lua
--- a/plugins/disco.lua	Tue Sep 21 14:06:56 2010 +0100
+++ b/plugins/disco.lua	Mon Oct 11 02:03:32 2010 +0100
@@ -356,11 +356,14 @@
 		initial_disco_started = true;
 		stream:disco_local_services(function (services)
 			for _, service in ipairs(services) do
-				for identity in pairs(stream.disco.cache[service.jid].identities) do
-					local category, type = identity:match("^(.*)/(.*)$");
-					stream:event("disco/service-discovered/"..category, {
-						type = type, jid = service.jid;
-					});
+				local service_disco_info = stream.disco.cache[service.jid];
+				if service_disco_info then
+					for identity in pairs(service_disco_info.identities) do
+						local category, type = identity:match("^(.*)/(.*)$");
+						stream:event("disco/service-discovered/"..category, {
+							type = type, jid = service.jid;
+						});
+					end
 				end
 			end
 			stream:event("ready");
diff -r 96efa9ee8f18 -r 386920f05808 plugins/ping.lua
--- a/plugins/ping.lua	Tue Sep 21 14:06:56 2010 +0100
+++ b/plugins/ping.lua	Mon Oct 11 02:03:32 2010 +0100
@@ -1,5 +1,3 @@
-require "util.xstanza";
-
 local xmlns_ping = "urn:xmpp:ping";
 
 function verse.plugins.ping(stream)
diff -r 96efa9ee8f18 -r 386920f05808 plugins/sasl.lua
--- a/plugins/sasl.lua	Tue Sep 21 14:06:56 2010 +0100
+++ b/plugins/sasl.lua	Mon Oct 11 02:03:32 2010 +0100
@@ -1,5 +1,4 @@
 local st = require "util.stanza";
-local stx = require "util.xstanza";
 local base64 = require "mime".b64;
 local xmlns_sasl = "urn:ietf:params:xml:ns:xmpp-sasl";
 
diff -r 96efa9ee8f18 -r 386920f05808 squishy
--- a/squishy	Tue Sep 21 14:06:56 2010 +0100
+++ b/squishy	Mon Oct 11 02:03:32 2010 +0100
@@ -4,7 +4,6 @@
 Module "util.encodings"		"libs/encodings.lua"
 Module "util.hashes"		"libs/hashes.lua"
 Module "util.logger"		"libs/logger.lua"
-Module "util.xstanza"		"libs/xstanza.lua"
 Module "util.sha1"		"util/sha1.lua"
 Module "lib.adhoc"              "libs/adhoc.lib.lua"