--- a/CMakeLists.txt	Tue May 03 02:30:09 2011 +0300
+++ b/CMakeLists.txt	Tue May 03 13:30:19 2011 +0300
@@ -85,9 +85,12 @@
 set(CPACK_SOURCE_IGNORE_FILES "/\\\\..*;\\\\.swp;~$;/build/;\\\\.tar\\\\.;\\\\.deb;\\\\.so")
 include(CPack)
 
+configure_file(avatar.avv.in avatar.avv)
+
 ## Installation
 install(TARGETS avatar DESTINATION lib/mcabber) 
 install(FILES avatar.rc COPYING TODO README DESTINATION share/doc/${CPACK_PACKAGE_NAME})
 install(DIRECTORY help DESTINATION share/mcabber)
+install(FILES ${PROJECT_BINARY_DIR}/avatar.avv DESTINATION share/mcabber/avv/modules RENAME avatar)
 
 ## The End ## vim: se ts=4 sw=4: ##

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/avatar.avv.in	Tue May 03 13:30:19 2011 +0300
@@ -0,0 +1,10 @@
+
+Name:        ${PROJECT_NAME}
+Method:      glib
+Version:     ${PROJECT_VERSION}
+Description: ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
+Requires:    modules:2 + pep:1 + commands:3 + compl:3 + settings:1 + utils:2 +
+             xmpp:4 + xmpp_helper:2 + screen:3 + hbuf:1 + hooks:4
+Init:        avatar_init
+Uninit:      avatar_uninit
+

--- a/avatar.c	Tue May 03 02:30:09 2011 +0300
+++ b/avatar.c	Tue May 03 13:30:19 2011 +0300
@@ -50,8 +50,8 @@
 
 // module description
 
-static void avatar_init   (void);
-static void avatar_uninit (void);
+void avatar_init   (void);
+void avatar_uninit (void);
 
 #define DESCRIPTION ( \
 	"PEP avatars handling\n" \
@@ -1167,7 +1167,7 @@
 	return HOOK_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
 }
 
-static void avatar_init (void)
+void avatar_init (void)
 {
 	pep_register_xmlns_handler (NS_AVATAR_METADATA, avatar_handler, NULL, NULL);
 	avatar_metadata_reply_handler = lm_message_handler_new (avatar_publish_metadata_reply_handler, NULL, NULL);
@@ -1188,7 +1188,7 @@
 	xmpp_add_feature (NS_AVATAR_METADATA_NOTIFY);
 }
 
-static void avatar_uninit (void)
+void avatar_uninit (void)
 {
 	xmpp_del_feature (NS_AVATAR_METADATA);
 	xmpp_del_feature (NS_AVATAR_METADATA_NOTIFY);