# HG changeset patch
# User Myhailo Danylenko <isbear@ukrpost.net>
# Date 1268595692 -7200
# Node ID ff36ae7e2b1eb899f2cdd7cbd258af110b5249ec
# Parent  0539bca09f116c87e652596a447ccbad048e7d46
Use new module struct with api

diff -r 0539bca09f11 -r ff36ae7e2b1e CMakeLists.txt
--- a/CMakeLists.txt	Thu Mar 04 19:50:56 2010 +0200
+++ b/CMakeLists.txt	Sun Mar 14 21:41:32 2010 +0200
@@ -16,6 +16,7 @@
 
 cmake_minimum_required(VERSION 2.6) 
 project(disco C) 
+set(PROJECT_VERSION "0.0.1")
 
 ## User settable options
  
@@ -49,7 +50,7 @@
 
 ## Packaging information
 set(CPACK_PACKAGE_NAME libmcabber-disco)
-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 service discovery requests")
diff -r 0539bca09f11 -r ff36ae7e2b1e config.h.in
--- a/config.h.in	Thu Mar 04 19:50:56 2010 +0200
+++ b/config.h.in	Sun Mar 14 21:41:32 2010 +0200
@@ -4,5 +4,7 @@
 
 #cmakedefine HAVE_LM_CONNECTION_UNREGISTER_REPLY_HANDLER
 
+#define PROJECT_VERSION ( "${PROJECT_VERSION}" )
+
 #endif
 
diff -r 0539bca09f11 -r ff36ae7e2b1e disco.c
--- a/disco.c	Thu Mar 04 19:50:56 2010 +0200
+++ b/disco.c	Sun Mar 14 21:41:32 2010 +0200
@@ -44,11 +44,28 @@
 static void disco_init   (void);
 static void disco_uninit (void);
 
+#define DESCRIPTION ( "Service discovery requests\nProvides command /disco" )
+
+static module_info_t info_disco_experimental = {
+	.branch      = "experimental",
+	.api         = 5,
+	.version     = PROJECT_VERSION,
+	.description = DESCRIPTION,
+	.requires    = NULL,
+	.init        = disco_init,
+	.uninit      = disco_uninit,
+	.next        = NULL,
+};
+
 module_info_t info_disco = {
-	.mcabber_version = "0.10.0",
-	.requires        = NULL,
-	.init            = disco_init,
-	.uninit          = disco_uninit,
+	.branch      = "dev",
+	.api         = 4,
+	.version     = PROJECT_VERSION,
+	.description = DESCRIPTION,
+	.requires    = NULL,
+	.init        = disco_init,
+	.uninit      = disco_uninit,
+	.next        = &info_disco_experimental,
 };
 
 //