--- a/examples/mcabberrc.lua	Mon Mar 23 02:04:43 2009 +0200
+++ b/examples/mcabberrc.lua	Mon Mar 23 02:05:20 2009 +0200
@@ -77,14 +77,12 @@
 
 -- This is a hack to allow loading of lm.lua and loudmouth.so from ~/.mcabber
 -- instead of installing them system-wide
+-- FIXME to C. we now require this by require'ing interdependencies between modules.
 if main.option ( 'lua_extra_include' ) then
 	package.path = main.fileoption ( 'lua_extra_include' ) .. '/?.lua;' .. package.path
 	package.cpath = main.fileoption ( 'lua_extra_include' ) .. '/?.so;' .. package.cpath
 end
 
-require 'lm'
-
-
 -- COMMON SUPPORT ROUTINES
 
 -- unused :/
@@ -235,62 +233,70 @@
 
 -- SAVING URLS TO FILE
 
-dopath 'urls'
+require 'urls'
 
 -- TRANSPORTED BUDDIES AVAILABILITY INDICATION
 
-dopath 'transports'
+require 'transports'
 
 -- BEEPING ON ALL MESSAGES
 
-dopath 'beep'
+require 'beep'
 
 -- MARKING
 
-dopath 'marking'
+require 'marking'
 
 -- JOBS
 
-dopath 'jobs'
+require 'jobs'
 
 -- ROOM NICK COMPLETION
 
-dopath 'room_priv'
+require 'room_priv'
 
 -- DATA FORMS (XEP-0004)
 
-dopath 'x_data'
+require 'x_data'
 
 -- SERVICE DISCOVERY (XEP-0030)
 
-dopath 'disco'
+require 'disco'
 
 -- IN-BAND BYTESTREAMS (XEP-0047)
 
-dopath 'ibb'
+require 'ibb'
 
 -- PUBLISH-SUBSRIBE (XEP-0060)
 
-dopath 'pubsub'
+require 'pubsub'
 
 -- OUT OF BAND DATA (XEP-0066)
 
-dopath 'oob'
+require 'oob'
 
 -- IN-BAND REGISTRATION (XEP-0077)
 
-dopath 'iq_register'
+require 'iq_register'
+
+-- USER AVATAR (XEP-0084)
+
+require 'avatar'
 
 -- REMOTE CONTROLLING CLIENTS (XEP-0146)
 
-dopath 'remote'
+require 'remote'
 
 -- PERSONAL EVENTING PROTOCOL (XEP-0163)
 
-dopath 'pep'
+require 'pep'
+
+-- XMPP PING (XEP-0199)
+
+require 'ping'
 
 -- ATTENTION (XEP-0224)
 
-dopath 'attention'
+require 'attention'
 
 -- The End -- vim: se ts=4: --