--- a/disco.c	Sun Jan 31 20:44:05 2010 +0200
+++ b/disco.c	Mon Feb 15 17:51:21 2010 +0200
@@ -594,19 +594,7 @@
 
 static void disco_hh (guint32 htype, hk_arg_t *args, gpointer ignore)
 {
-#ifdef HOOK_PRE_DISCONNECT
 	disco_unregister_handlers ();
-#else
-	hk_arg_t *arg;
-
-	for (arg = args; arg->name; ++arg)
-		if (!strcmp (arg->name, "hook")) {
-			if (!strcmp (arg->value, "hook-pre-disconnect"))
-				disco_unregister_handlers ();
-			return;
-		}
-#endif
-
 	return;
 }
 
@@ -620,11 +608,7 @@
 	}
 
 	// hook handler
-#ifdef HOOK_PRE_DISCONNECT
 	hk_add_handler (disco_hh, HOOK_PRE_DISCONNECT, NULL);
-#else
-	hk_add_handler (disco_hh, HOOK_INTERNAL, NULL);
-#endif
 
 	// command
 	cmd_add ("disco", "", disco_cid, COMPL_JID, do_disco, NULL);