--- a/config.h.in	Sun Mar 27 20:02:12 2011 +0200
+++ b/config.h.in	Sun Mar 27 20:24:35 2011 +0200
@@ -6,12 +6,6 @@
 
 #include <mcabber/config.h>
 
-#if MCABBER_BRANCH_EXPERIMENTAL && MCABBER_API_VERSION >= 34
-#  define HAVE_CMD_ID
-#elif MCABBER_BRANCH_DEV && MCABBER_API_VERSION >= 20
-#  define HAVE_CMD_ID
-#endif
-
 #define PROJECT_VERSION ( "${PROJECT_VERSION}" )
 
 #endif

--- a/disco.c	Sun Mar 27 20:02:12 2011 +0200
+++ b/disco.c	Sun Mar 27 20:24:35 2011 +0200
@@ -119,7 +119,7 @@
 // globals
 //
 
-#ifdef HAVE_CMD_ID
+#ifdef MCABBER_API_HAVE_CMD_ID
 static gpointer disco_cmid = NULL;
 #endif
 
@@ -691,7 +691,7 @@
 	disco_hid = hk_add_handler (disco_hh, HOOK_PRE_DISCONNECT, G_PRIORITY_DEFAULT, NULL);
 
 	// command
-#ifndef HAVE_CMD_ID
+#ifndef MCABBER_API_HAVE_CMD_ID
 	cmd_add ("disco", "", disco_cid, COMPL_JID, do_disco, NULL);
 #else
 	disco_cmid = cmd_add ("disco", "", disco_cid, COMPL_JID, do_disco, NULL);
@@ -703,7 +703,7 @@
 static void disco_uninit (void)
 {
 	// command
-#ifndef HAVE_CMD_ID
+#ifndef MCABBER_API_HAVE_CMD_ID
 	cmd_del ("disco");
 #else
 	if (disco_cmid)