# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1245769136 -3600
# Node ID 2ebed659b958db96025dc455f8b59540539e51b4
# Parent  576143941a76d570c061f76645c8c5b9c4ad58bb# Parent  b910ef82622d6b017a856c68e4dfaddbeaa92317
Automated merge with http://waqas.ath.cx:8000/

diff -r b910ef82622d -r 2ebed659b958 core/modulemanager.lua
--- a/core/modulemanager.lua	Tue Jun 23 15:40:30 2009 +0100
+++ b/core/modulemanager.lua	Tue Jun 23 15:58:56 2009 +0100
@@ -30,7 +30,7 @@
 local type = type;
 local next = next;
 local rawget = rawget;
-
+local error = error;
 local tostring = tostring;
 
 -- We need this to let modules access the real global namespace
@@ -408,6 +408,16 @@
 	return api.hook(self, "stanza/"..(xmlns and (xmlns..":") or "")..name, function (data) return handler(data.origin, data.stanza, data); end, priority);
 end
 
+function api:require(lib)
+	local f, n = pluginloader.load_code(self.name, lib..".lib.lua");
+	if not f then
+		f, n = pluginloader.load_code(lib, lib..".lib.lua");
+	end
+	if not f then error("Failed to load plugin library '"..lib.."', error: "..n); end -- FIXME better error message
+	setfenv(f, setmetatable({ module = self }, { __index = _G }));
+	return f();
+end
+
 --------------------------------------------------------------------
 
 local actions = {};