Diff

--- a/squishy	Thu Nov 24 06:23:43 2011 +0100
+++ b/squishy	Sun Nov 27 21:40:42 2011 +0000
@@ -29,38 +29,35 @@
 Module "util.vcard"		"util/vcard.lua"
 
 -- Verse plugins
-local function Plugin(name)
-	Module("verse.plugins."..name)("plugins/"..name..".lua")
+plugins = {
+	-- Login
+	"tls", "sasl", "bind", "session", "legacy", "compression";
+	-- Reliability
+	"smacks", "keepalive";
+	-- Queries
+	"disco", "version", "ping", "uptime";
+	-- Privacy control
+	"blocking";
+	-- Jingle / file transfer
+	"jingle", "jingle_ft", "jingle_s5b", "proxy65", "jingle_ibb";
+	-- Pubsub
+	"pubsub", "pep";
+	-- Command and control
+	"adhoc";
+	-- Basics
+	"presence", "private", "roster", "register";
+	-- MUC
+	"groupchat";
+	-- vCard
+	"vcard", "vcard_update";
+	-- Carbons
+	"carbons";
+}
+
+for _, plugin in ipairs(plugins) do
+	Module("verse.plugins."..plugin)("plugins/"..plugin..".lua")
 end
-Plugin "tls"
-Plugin "sasl"
-Plugin "bind"
-Plugin "legacy"
-Plugin "pubsub"
-Plugin "version"
-Plugin "ping"
-Plugin "session"
-Plugin "compression"
-Plugin "blocking"
-Plugin "proxy65"
-Plugin "jingle"
-Plugin "jingle_ft"
-Plugin "jingle_s5b"
-Plugin "jingle_ibb"
-Plugin "presence"
-Plugin "disco"
-Plugin "pep"
-Plugin "adhoc"
-Plugin "private"
-Plugin "groupchat"
-Plugin "uptime"
-Plugin "smacks"
-Plugin "keepalive"
-Plugin "roster"
-Plugin "vcard"
-Plugin "vcard_update"
-Plugin "carbons"
-
+	
 Module "net.httpclient_listener" "net/httpclient_listener.lua"
 Module "net.connlisteners" "net/connlisteners.lua"
 Module "util.httpstream" "util/httpstream.lua"