--- a/modularize-extcmd	Wed Apr 07 17:28:19 2010 +0300
+++ b/modularize-extcmd	Sun Apr 11 20:53:04 2010 +0300
@@ -1,6 +1,6 @@
-diff -r dd931e80115e mcabber/configure.ac
---- a/mcabber/configure.ac	Fri Apr 02 10:47:27 2010 +0300
-+++ b/mcabber/configure.ac	Fri Apr 02 10:49:28 2010 +0300
+diff -r 76a0b8b7f1e6 mcabber/configure.ac
+--- a/mcabber/configure.ac	Sun Apr 11 20:32:20 2010 +0300
++++ b/mcabber/configure.ac	Sun Apr 11 20:44:40 2010 +0300
 @@ -283,6 +283,7 @@
                   modules/beep/Makefile
                   modules/xttitle/Makefile
@@ -9,9 +9,9 @@
                   doc/Makefile
                   doc/guide/Makefile
                   doc/help/Makefile
-diff -r dd931e80115e mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am	Fri Apr 02 10:47:27 2010 +0300
-+++ b/mcabber/mcabber/Makefile.am	Fri Apr 02 10:49:28 2010 +0300
+diff -r 76a0b8b7f1e6 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am	Sun Apr 11 20:32:20 2010 +0300
++++ b/mcabber/mcabber/Makefile.am	Sun Apr 11 20:44:40 2010 +0300
 @@ -7,7 +7,7 @@
  		  xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \
  		  xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \
@@ -30,9 +30,9 @@
  endif
  
  #SUBDIRS =
-diff -r dd931e80115e mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c	Fri Apr 02 10:47:27 2010 +0300
-+++ b/mcabber/mcabber/hooks.c	Fri Apr 02 10:49:28 2010 +0300
+diff -r 76a0b8b7f1e6 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c	Sun Apr 11 20:32:20 2010 +0300
++++ b/mcabber/mcabber/hooks.c	Sun Apr 11 20:44:40 2010 +0300
 @@ -36,7 +36,10 @@
  #include "utf8.h"
  #include "commands.h"
@@ -55,7 +55,7 @@
    int message_flags = 0;
    guint rtype = ROSTER_TYPE_USER;
    char *wmsg = NULL, *bmsg = NULL, *mmsg = NULL;
-@@ -385,6 +390,7 @@
+@@ -391,6 +396,7 @@
    }
  #endif
  
@@ -63,7 +63,7 @@
    if (settings_opt_get_int("events_ignore_active_window") &&
        current_buddy && scr_get_chatmode()) {
      gpointer bud = BUDDATA(current_buddy);
-@@ -403,6 +409,7 @@
+@@ -409,6 +415,7 @@
      hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE,
                 is_groupchat ? EXT_CMD_INFO_GROUPCHAT : EXT_CMD_INFO_RECEIVED,
                 wmsg);
@@ -71,7 +71,7 @@
  
    // Beep, if enabled:
    // - if it's a private message
-@@ -479,8 +486,10 @@
+@@ -485,8 +492,10 @@
    }
  #endif
  
@@ -82,7 +82,7 @@
  
    g_free(bmsg);
    g_free(mmsg);
-@@ -566,9 +575,11 @@
+@@ -572,9 +581,11 @@
    }
  #endif
  
@@ -94,7 +94,7 @@
  }
  
  void hk_mystatuschange(time_t timestamp, enum imstatus old_status,
-@@ -692,11 +703,13 @@
+@@ -698,11 +709,13 @@
    prev_muc_unread    = muc_unread;
    prev_muc_attention = muc_attention;
  
@@ -108,9 +108,9 @@
  }
  
  /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
-diff -r dd931e80115e mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Fri Apr 02 10:47:27 2010 +0300
-+++ b/mcabber/mcabber/main.c	Fri Apr 02 10:49:28 2010 +0300
+diff -r 76a0b8b7f1e6 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Sun Apr 11 20:32:20 2010 +0300
++++ b/mcabber/mcabber/main.c	Sun Apr 11 20:44:40 2010 +0300
 @@ -45,7 +45,10 @@
  #include "xmpp.h"
  #include "help.h"
@@ -135,15 +135,15 @@
  
    optstring = settings_opt_get("roster_display_filter");
    if (optstring)
-diff -r dd931e80115e mcabber/modules/Makefile.am
---- a/mcabber/modules/Makefile.am	Fri Apr 02 10:47:27 2010 +0300
-+++ b/mcabber/modules/Makefile.am	Fri Apr 02 10:49:28 2010 +0300
+diff -r 76a0b8b7f1e6 mcabber/modules/Makefile.am
+--- a/mcabber/modules/Makefile.am	Sun Apr 11 20:32:20 2010 +0300
++++ b/mcabber/modules/Makefile.am	Sun Apr 11 20:44:40 2010 +0300
 @@ -1,1 +1,1 @@
 -SUBDIRS = beep xttitle fifo
 +SUBDIRS = beep xttitle fifo eventcmd
-diff -r dd931e80115e mcabber/modules/eventcmd/Makefile.am
+diff -r 76a0b8b7f1e6 mcabber/modules/eventcmd/Makefile.am
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/Makefile.am	Fri Apr 02 10:49:28 2010 +0300
++++ b/mcabber/modules/eventcmd/Makefile.am	Sun Apr 11 20:44:40 2010 +0300
 @@ -0,0 +1,12 @@
 +
 +if INSTALL_HEADERS
@@ -157,9 +157,9 @@
 +				$(ENCHANT_CFLAGS)
 +endif
 +
-diff -r dd931e80115e mcabber/modules/eventcmd/eventcmd.c
+diff -r 76a0b8b7f1e6 mcabber/modules/eventcmd/eventcmd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/eventcmd.c	Fri Apr 02 10:49:28 2010 +0300
++++ b/mcabber/modules/eventcmd/eventcmd.c	Sun Apr 11 20:44:40 2010 +0300
 @@ -0,0 +1,221 @@
 +
 +/* Copyright 2009 Myhailo Danylenko
@@ -232,7 +232,7 @@
 +      bjid = arg->value;
 +    else if (!strcmp(arg->name, "groupchat"))
 +      is_groupchat = strcmp(arg->value, "true") ? FALSE : TRUE;
-+    else if (!strcmp(arg->name, "timestamp") && arg->value)
++    else if (!strcmp(arg->name, "delayed") && *(arg->value))
 +      timestamp = TRUE;
 +    else if (!strcmp(arg->name, "message"))
 +      wmsg = arg->value;