--- a/cmd.c	Thu Jun 30 16:10:03 2011 +0300
+++ b/cmd.c	Sun Jul 22 15:11:26 2012 +0300
@@ -45,9 +45,9 @@
 	"Recognizes options cmd_shell, cmd_redirect_stderr, cmd_header and cmd_header_inline\n" \
 	"Provides command /cmd" )
 
-static module_info_t info_cmd_dev = {
-	.branch          = "dev",
-	.api             = 20,
+module_info_t info_cmd = {
+	.branch          = MCABBER_BRANCH,
+	.api             = MCABBER_API_VERSION,
 	.version         = PROJECT_VERSION,
 	.description     = DESCRIPTION,
 	.requires        = NULL,
@@ -56,17 +56,6 @@
 	.next            = NULL,
 };
 
-module_info_t info_cmd = {
-	.branch          = "0.10.1",
-	.api             = 1,
-	.version         = PROJECT_VERSION,
-	.description     = DESCRIPTION,
-	.requires        = NULL,
-	.init            = mcmd_init,
-	.uninit          = mcmd_uninit,
-	.next            = &info_cmd_dev,
-};
-
 typedef struct {
 	gchar      *jid;
 	GString    *input;
@@ -232,7 +221,7 @@
 	if (cb -> subject)
 		g_free (cb -> subject);
 	g_free (cb->jid);
-	g_free (cb);
+	g_slice_free (cmd_cb_t, cb);
 }
 
 static void do_cmd (char *arg)
@@ -307,7 +296,7 @@
 		}
 
 		{
-			cmd_cb_t *cb = g_new (cmd_cb_t, 1);
+			cmd_cb_t *cb = g_slice_new (cmd_cb_t);
 
 			if (settings_opt_get_int ("cmd_header")) {
 				if (settings_opt_get_int ("cmd_header_inline") || is_room (jid)) {
@@ -363,7 +352,7 @@
 		if (cb->channel)
 			g_io_channel_unref (cb->channel);
 		g_free (cb->jid);
-		g_free (cb);
+		g_slice_free (cmd_cb_t, cb);
 	}
 
 	g_slist_free (cmd_channels);