# HG changeset patch
# User Myhailo Danylenko <isbear@ukrpost.net>
# Date 1268595389 -7200
# Node ID 19d13d97b3a1d29e495bcb967a4bb18e0bcee65e
# Parent  891fc0779d50a4bee1b2bc4048de6f32329874c4
Use new module struct with api

diff -r 891fc0779d50 -r 19d13d97b3a1 CMakeLists.txt
--- a/CMakeLists.txt	Thu Mar 04 19:50:39 2010 +0200
+++ b/CMakeLists.txt	Sun Mar 14 21:36:29 2010 +0200
@@ -16,6 +16,7 @@
 
 cmake_minimum_required(VERSION 2.6) 
 project(cmd C) 
+set(PROJECT_VERSION "0.0.1")
 
 ## User settable options
  
@@ -30,6 +31,7 @@
 add_library(cmd MODULE cmd.c) 
 
 ## Compiler setup
+configure_file(config.h.in config.h)
 include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} 
                     ${MCABBER_INCLUDE_DIRS})
 target_link_libraries(cmd ${GLIB_LIBRARIES} 
@@ -39,7 +41,7 @@
 
 ## Packaging information
 set(CPACK_PACKAGE_NAME libmcabber-cmd)
-set(CPACK_PACKAGE_VERSION "0.0.1")
+set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 set(CPACK_PACKAGE_VENDOR "IsBear")
 set(CPACK_PACKAGE_CONTACT "Myhailo Danylenko <isbear@ukrpost.net>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber module for sending shell commands output to others")
diff -r 891fc0779d50 -r 19d13d97b3a1 cmd.c
--- a/cmd.c	Thu Mar 04 19:50:39 2010 +0200
+++ b/cmd.c	Sun Mar 14 21:36:29 2010 +0200
@@ -33,14 +33,36 @@
 #include <mcabber/roster.h>
 #include <mcabber/modules.h>
 
+#include "config.h"
+
 static void mcmd_init   (void);
 static void mcmd_uninit (void);
 
-module_info_t info_cmd = {
-	.mcabber_version = "0.10.0",
+#define DESCRIPTION ( \
+	"Sends output of command to buddy\n" \
+	"Recognizes options cmd_shell, cmd_redirect_stderr, cmd_header and cmd_header_inline\n" \
+	"Provides command /cmd" )
+
+static module_info_t info_cmd_experimental = {
+	.branch          = "experimental",
+	.api             = 5,
+	.version         = PROJECT_VERSION,
+	.description     = DESCRIPTION,
 	.requires        = NULL,
 	.init            = mcmd_init,
 	.uninit          = mcmd_uninit,
+	.next            = NULL,
+};
+
+module_info_t info_cmd = {
+	.branch          = "dev",
+	.api             = 4,
+	.version         = PROJECT_VERSION,
+	.description     = DESCRIPTION,
+	.requires        = NULL,
+	.init            = mcmd_init,
+	.uninit          = mcmd_uninit,
+	.next            = &info_cmd_experimental,
 };
 
 typedef struct {
diff -r 891fc0779d50 -r 19d13d97b3a1 config.h.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.h.in	Sun Mar 14 21:36:29 2010 +0200
@@ -0,0 +1,8 @@
+
+#ifndef LOCAL_CONFIG_H
+#define LOCAL_CONFIG_H
+
+#define PROJECT_VERSION ( "${PROJECT_VERSION}" )
+
+#endif
+