# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1268572045 -3600
# Node ID 250ad919f03f8d3618fc6d5bd779dc5157abeb82
# Parent  af3de54ef9860ea60a7a251e3f6ea2eb8804ae44
Small code cleanup in hooks.[ch]

diff -r af3de54ef986 -r 250ad919f03f mcabber/mcabber/hooks.c
--- a/mcabber/mcabber/hooks.c	Sun Mar 14 12:48:21 2010 +0100
+++ b/mcabber/mcabber/hooks.c	Sun Mar 14 14:07:25 2010 +0100
@@ -47,16 +47,16 @@
 
 static GSList *hk_handler_queue = NULL;
 
-void hk_add_handler (hk_handler_t handler, guint32 flags, gpointer userdata)
+void hk_add_handler(hk_handler_t handler, guint32 flags, gpointer userdata)
 {
-  hook_list_data_t *h = g_new (hook_list_data_t, 1);
+  hook_list_data_t *h = g_new(hook_list_data_t, 1);
   h->handler  = handler;
   h->flags    = flags;
   h->userdata = userdata;
-  hk_handler_queue = g_slist_append (hk_handler_queue, h);
+  hk_handler_queue = g_slist_append(hk_handler_queue, h);
 }
 
-static gint hk_queue_search_cb (hook_list_data_t *a, hook_list_data_t *b)
+static gint hk_queue_search_cb(hook_list_data_t *a, hook_list_data_t *b)
 {
   if (a->handler == b->handler && a->userdata == b->userdata)
     return 0;
@@ -64,13 +64,14 @@
     return 1;
 }
 
-void hk_del_handler (hk_handler_t handler, gpointer userdata)
+void hk_del_handler(hk_handler_t handler, gpointer userdata)
 {
   hook_list_data_t h = { handler, 0, userdata };
-  GSList *el = g_slist_find_custom (hk_handler_queue, &h, (GCompareFunc) hk_queue_search_cb);
+  GSList *el = g_slist_find_custom(hk_handler_queue, &h,
+                                   (GCompareFunc) hk_queue_search_cb);
   if (el) {
     g_free (el->data);
-    hk_handler_queue = g_slist_delete_link (hk_handler_queue, el);
+    hk_handler_queue = g_slist_delete_link(hk_handler_queue, el);
   }
 }
 #endif
@@ -236,19 +237,6 @@
   {
     GSList *h = hk_handler_queue;
     if (h) {
-#if 0
-      hk_arg_t *args = g_new (hk_arg_t, 5);
-      args[0].name = "hook";
-      args[0].value = "hook-message-in";
-      args[1].name = "jid";
-      args[1].value = bjid;
-      args[2].name = "message";
-      args[2].value = wmsg;
-      args[3].name = "groupchat";
-      args[3].value = is_groupchat ? "true" : "false";
-      args[4].name = NULL;
-      args[4].value = NULL;
-#else
       // We can use a const array for keys/static values, so modules
       // can do fast known to them args check by just comparing pointers...
       hk_arg_t args[] = {
@@ -258,7 +246,6 @@
         { "groupchat", is_groupchat ? "true" : "false" },
         { NULL, NULL },
       };
-#endif
       while (h) {
         hook_list_data_t *data = h->data;
         if (data->flags & HOOK_MESSAGE_IN)
diff -r af3de54ef986 -r 250ad919f03f mcabber/mcabber/hooks.h
--- a/mcabber/mcabber/hooks.h	Sun Mar 14 12:48:21 2010 +0100
+++ b/mcabber/mcabber/hooks.h	Sun Mar 14 14:07:25 2010 +0100
@@ -28,8 +28,8 @@
 
 typedef void (*hk_handler_t) (guint32 flags, hk_arg_t *args, gpointer userdata);
 
-void hk_add_handler (hk_handler_t handler, guint32 flags, gpointer userdata);
-void hk_del_handler (hk_handler_t handler, gpointer userdata);
+void hk_add_handler(hk_handler_t handler, guint32 flags, gpointer userdata);
+void hk_del_handler(hk_handler_t handler, gpointer userdata);
 #endif
 
 void hk_message_in(const char *bjid, const char *resname,
@@ -42,8 +42,8 @@
                      time_t timestamp, enum imstatus status,
                      char const *status_msg);
 void hk_mystatuschange(time_t timestamp,
-                              enum imstatus old_status,
-                              enum imstatus new_status, const char *msg);
+                       enum imstatus old_status, enum imstatus new_status,
+                       const char *msg);
 
 void hk_postconnect(void);
 void hk_predisconnect(void);