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

--- a/config.h.in	Tue May 03 02:30:09 2011 +0300
+++ b/config.h.in	Tue May 03 14:44:28 2011 +0300
@@ -2,15 +2,6 @@
 #ifndef LOCAL_CONFIG_H
 #define LOCAL_CONFIG_H
 
-#include <mcabber/config.h>
-
-#if MCABBER_BRANCH_EXPERIMENTAL && MCABBER_API_VERSION >= 27
-#  define HAVE_CMD_ID
-#  if MCABBER_API_VERSION >= 28
-#    define HAVE_CMD_SAFE
-#  endif
-#endif
-
 #define PROJECT_VERSION ( "${PROJECT_VERSION}" )
 
 #endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/env.avv.in	Tue May 03 14:44:28 2011 +0300
@@ -0,0 +1,9 @@
+
+Name:        ${PROJECT_NAME}
+Method:      glib
+Version:     ${PROJECT_VERSION}
+Description: ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
+Requires:    modules:2 + commands:3 + compl:3 + logprint:3 + utils:2
+Init:        env_load
+Uninit:      env_unload
+

--- a/env.c	Tue May 03 02:30:09 2011 +0300
+++ b/env.c	Tue May 03 14:44:28 2011 +0300
@@ -30,17 +30,18 @@
 #include <mcabber/compl.h>
 #include <mcabber/logprint.h>
 #include <mcabber/modules.h>
+#include <mcabber/api.h>
 
 #include "config.h"
 
-static void env_load   (void);
-static void env_unload (void);
+void env_load   (void);
+void env_unload (void);
 
 #define DESCRIPTION ( "Some debugging routines\nProvides commands /env and /cd" )
 
-static module_info_t info_env_experimental = {
-	.branch      = "experimental",
-	.api         = 28,
+static module_info_t info_env_dev = {
+	.branch      = "dev",
+	.api         = 20,
 	.version     = PROJECT_VERSION,
 	.description = DESCRIPTION,
 	.requires    = NULL,
@@ -49,19 +50,8 @@
 	.next        = NULL,
 };
 
-static module_info_t info_env_dev = {
-	.branch      = "dev",
-	.api         = 13,
-	.version     = PROJECT_VERSION,
-	.description = DESCRIPTION,
-	.requires    = NULL,
-	.init        = env_load,
-	.uninit      = env_unload,
-	.next        = &info_env_experimental,
-};
-
 module_info_t info_env = {
-	.branch      = "0.10.0",
+	.branch      = "0.10.1",
 	.api         = 1,
 	.version     = PROJECT_VERSION,
 	.description = DESCRIPTION,
@@ -71,14 +61,12 @@
 	.next        = &info_env_dev,
 };
 
-#ifdef HAVE_CMD_ID
+#ifdef MCABBER_API_HAVE_CMD_ID
 static gpointer env_env_cmid = NULL;
 static gpointer env_cd_cmid  = NULL;
-#ifdef HAVE_CMD_SAFE
 static gboolean env_env_set_safe = FALSE;
 static gboolean env_cd_set_safe  = FALSE;
 #endif
-#endif
 
 extern char **environ;
 
@@ -180,26 +168,24 @@
 		scr_log_print (LPRINT_NORMAL, "Cannot change current working directory: %s.", strerror (errno));
 }
 
-static void env_load (void)
+void env_load (void)
 {
 	// command
-#ifndef HAVE_CMD_ID
+#ifndef MCABBER_API_HAVE_CMD_ID
 	cmd_add ("env", "", 0, 0, do_env, NULL);
 	cmd_add ("cd", "", COMPL_FILENAME, 0, do_cd, NULL);
 #else
 	env_env_cmid = cmd_add ("env", "", 0, 0, do_env, NULL);
 	env_cd_cmid  = cmd_add ("cd", "", COMPL_FILENAME, 0, do_cd, NULL);
-#ifdef HAVE_CMD_SAFE
 	env_env_set_safe = cmd_set_safe ("env", TRUE);
 	env_cd_set_safe  = cmd_set_safe ("cd",  TRUE);
 #endif
-#endif
 }
 
-static void env_unload (void)
+void env_unload (void)
 {
 	// command
-#ifndef HAVE_CMD_ID
+#ifndef MCABBER_API_HAVE_CMD_ID
 	cmd_del ("cd");
 	cmd_del ("env");
 #else
@@ -207,13 +193,11 @@
 		cmd_del (env_env_cmid);
 	if (env_cd_cmid)
 		cmd_del (env_cd_cmid);
-#ifdef HAVE_CMD_SAFE
 	if (env_env_set_safe)
 		cmd_set_safe ("env", FALSE);
 	if (env_cd_set_safe)
 		cmd_set_safe ("cd", FALSE);
 #endif
-#endif
 }
 
 /* vim: se ts=4 sw=4: */