Update handler return code defines (take #2)
authorMikael Berthe <mikael@lilotux.net>
Mon, 22 Mar 2010 22:39:47 +0100
changeset 1816 6ac5718f8d25
parent 1815 6abca6000762
child 1817 fb6d20a17584
Update handler return code defines (take #2)
mcabber/ChangeLog.api
mcabber/mcabber/hooks.c
mcabber/mcabber/hooks.h
--- a/mcabber/ChangeLog.api	Mon Mar 22 22:16:28 2010 +0100
+++ b/mcabber/ChangeLog.api	Mon Mar 22 22:39:47 2010 +0100
@@ -1,6 +1,6 @@
 dev (11)
 
- * s/ALLOW_MORE_HOOKS/ALLOW_MORE_HANDLERS/ in handler return code
+ * s/MORE_HOOK/MORE_HANDLER/ in handler return code
  * Changeset 1c3efa9bc422
 
   -- Mikael Berthe, 2010-03-22
--- a/mcabber/mcabber/hooks.c	Mon Mar 22 22:16:28 2010 +0100
+++ b/mcabber/mcabber/hooks.c	Mon Mar 22 22:39:47 2010 +0100
@@ -243,7 +243,7 @@
       { NULL, NULL },
     };
     h_result = hk_run_handlers(HOOK_PRE_MESSAGE_IN, args);
-    if (h_result == HOOK_HANDLER_RESULT_NO_MORE_HOOK_DROP_DATA) {
+    if (h_result == HOOK_HANDLER_RESULT_NO_MORE_HANDLER_DROP_DATA) {
       scr_LogPrint(LPRINT_DEBUG, "Message dropped (hook result).");
       g_free(bmsg);
       g_free(mmsg);
--- a/mcabber/mcabber/hooks.h	Mon Mar 22 22:16:28 2010 +0100
+++ b/mcabber/mcabber/hooks.h	Mon Mar 22 22:39:47 2010 +0100
@@ -25,8 +25,8 @@
 
 typedef enum {
   HOOK_HANDLER_RESULT_ALLOW_MORE_HANDLERS = 0,
-  HOOK_HANDLER_RESULT_NO_MORE_HOOK,
-  HOOK_HANDLER_RESULT_NO_MORE_HOOK_DROP_DATA,
+  HOOK_HANDLER_RESULT_NO_MORE_HANDLER,
+  HOOK_HANDLER_RESULT_NO_MORE_HANDLER_DROP_DATA,
 } hk_handler_result;
 
 typedef struct {