--- a/avatar.c	Tue Jan 26 13:03:50 2010 +0200
+++ b/avatar.c	Mon Feb 15 17:12:12 2010 +0200
@@ -1107,21 +1107,12 @@
 // release handlers before reconnect
 static void avatar_hh (guint32 hid, hk_arg_t *args, gpointer userdata)
 {
-#ifndef HOOK_POST_CONNECT
-	hk_arg_t *arg;
+	if (hid == HOOK_PRE_DISCONNECT)
 
-	for (arg = args; arg->name; arg++) {
-		if (!strcmp (arg->name, "hook")) {
-			if (!strcmp (arg->value, "hook-pre-disconnect")) {
-#else
-	if (hid == HOOK_PRE_DISCONNECT) {
-#endif
 		avatar_free_reply_handlers ();
-#ifndef HOOK_POST_CONNECT
-			} else if (publish_delayed && !strcmp (arg -> value, "hook-post-connect")) {
-#else
-	} else if (hid == HOOK_POST_CONNECT && publish_delayed) {
-#endif
+
+	else if (hid == HOOK_POST_CONNECT && publish_delayed) {
+
 		char *tmp_data = publish_data;
 
 		scr_LogPrint (LPRINT_DEBUG, "avatar: Publishing delayed data.");
@@ -1132,12 +1123,6 @@
 		avatar_publish (publish_data, publish_len);
 
 		g_free (tmp_data);
-#ifndef HOOK_POST_CONNECT
-			}
-
-			return;
-		}
-#endif
 	}
 }
 
@@ -1148,11 +1133,7 @@
 
 	cmd_add ("avatar", "", COMPL_FILENAME, 0, do_avatar, NULL);
 
-#ifdef HOOK_PRE_DISCONNECT
 	hk_add_handler (avatar_hh, HOOK_PRE_DISCONNECT | HOOK_POST_CONNECT, NULL);
-#else
-	hk_add_handler (avatar_hh, HOOK_INTERNAL, NULL);
-#endif
 
 	xmpp_add_feature (NS_AVATAR_METADATA);
 	xmpp_add_feature (NS_AVATAR_METADATA_NOTIFY);