--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/add-hook-post-message-in-timestamp	Fri Apr 02 10:55:37 2010 +0300
@@ -0,0 +1,44 @@
+diff -r 09901bac45fb mcabber/doc/HOWTO_modules.txt
+--- a/mcabber/doc/HOWTO_modules.txt	Fri Apr 02 10:41:43 2010 +0300
++++ b/mcabber/doc/HOWTO_modules.txt	Fri Apr 02 10:46:49 2010 +0300
+@@ -206,6 +206,8 @@
+    * attention - In a MUC message, true if you've been highlighted
+      In a regular message, true if the sender has requested your
+      attention (only implemented for MUC currently)
++   * timestamp - real date for messages with delayed delivery, eg MUC
++     room history.
+  - hook-message-out (HOOK_MESSAGE_OUT) with parameters
+    * jid - recipient of the outgoing message
+    * message - message body, converted to locale charset
+diff -r 09901bac45fb mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h	Fri Apr 02 10:41:43 2010 +0300
++++ b/mcabber/mcabber/api.h	Fri Apr 02 10:46:49 2010 +0300
+@@ -3,7 +3,7 @@
+ 
+ #include <mcabber/config.h> // For MCABBER_BRANCH
+ 
+-#define MCABBER_API_VERSION 12
++#define MCABBER_API_VERSION 13
+ #define MCABBER_API_MIN     12
+ 
+ extern const gchar *mcabber_branch;
+diff -r 09901bac45fb mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c	Fri Apr 02 10:41:43 2010 +0300
++++ b/mcabber/mcabber/hooks.c	Fri Apr 02 10:46:49 2010 +0300
+@@ -369,12 +369,16 @@
+ 
+ #ifdef MODULES_ENABLE
+   {
++    char timestamp_str[20];
++    if (timestamp)
++      to_iso8601(timestamp_str, timestamp);
+     hk_arg_t args[] = {
+       { "jid", bjid },
+       { "resource", resname },
+       { "message", wmsg },
+       { "groupchat", is_groupchat ? "true" : "false" },
+       { "attention", attention ? "true" : "false" },
++      { "timestamp", timestamp ? timestamp_str : NULL },
+       { NULL, NULL },
+     };
+     hk_run_handlers(HOOK_POST_MESSAGE_IN, args);

--- a/direct-invite	Fri Apr 02 10:02:50 2010 +0300
+++ b/direct-invite	Fri Apr 02 10:55:37 2010 +0300
@@ -1,18 +1,6 @@
-diff -r 28e29ca86694 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api	Fri Apr 02 02:38:41 2010 +0300
-+++ b/mcabber/ChangeLog.api	Fri Apr 02 10:02:21 2010 +0300
-@@ -1,3 +1,8 @@
-+
-+experimental (14)
-+
-+ * Add NS_X_CONFERENCE (direct invitation)
-+ * MQ Patch: direct-invite
- 
- experimental (13)
- 
-diff -r 28e29ca86694 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h	Fri Apr 02 02:38:41 2010 +0300
-+++ b/mcabber/mcabber/api.h	Fri Apr 02 10:02:21 2010 +0300
+diff -r c8ac1dfbb0cf mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h	Fri Apr 02 10:49:32 2010 +0300
++++ b/mcabber/mcabber/api.h	Fri Apr 02 10:50:28 2010 +0300
 @@ -3,7 +3,7 @@
  
  #include <mcabber/config.h> // For MCABBER_BRANCH
@@ -22,9 +10,9 @@
  #define MCABBER_API_MIN     12
  
  extern const gchar *mcabber_branch;
-diff -r 28e29ca86694 mcabber/mcabber/xmpp.c
---- a/mcabber/mcabber/xmpp.c	Fri Apr 02 02:38:41 2010 +0300
-+++ b/mcabber/mcabber/xmpp.c	Fri Apr 02 10:02:21 2010 +0300
+diff -r c8ac1dfbb0cf mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c	Fri Apr 02 10:49:32 2010 +0300
++++ b/mcabber/mcabber/xmpp.c	Fri Apr 02 10:50:28 2010 +0300
 @@ -1290,6 +1290,18 @@
                                     "http://jabber.org/protocol/muc#user");
      if (x && !strcmp(x->name, "x"))
@@ -44,9 +32,9 @@
    }
  
    return LM_HANDLER_RESULT_REMOVE_MESSAGE;
-diff -r 28e29ca86694 mcabber/mcabber/xmpp_defines.h
---- a/mcabber/mcabber/xmpp_defines.h	Fri Apr 02 02:38:41 2010 +0300
-+++ b/mcabber/mcabber/xmpp_defines.h	Fri Apr 02 10:02:21 2010 +0300
+diff -r c8ac1dfbb0cf mcabber/mcabber/xmpp_defines.h
+--- a/mcabber/mcabber/xmpp_defines.h	Fri Apr 02 10:49:32 2010 +0300
++++ b/mcabber/mcabber/xmpp_defines.h	Fri Apr 02 10:50:28 2010 +0300
 @@ -27,6 +27,8 @@
  #define NS_BROWSE    "jabber:iq:browse"
  #define NS_EVENT     "jabber:x:event"
@@ -56,9 +44,9 @@
  #define NS_SIGNED    "jabber:x:signed"
  #define NS_ENCRYPTED "jabber:x:encrypted"
  #define NS_GATEWAY   "jabber:iq:gateway"
-diff -r 28e29ca86694 mcabber/mcabber/xmpp_helper.c
---- a/mcabber/mcabber/xmpp_helper.c	Fri Apr 02 02:38:41 2010 +0300
-+++ b/mcabber/mcabber/xmpp_helper.c	Fri Apr 02 10:02:21 2010 +0300
+diff -r c8ac1dfbb0cf mcabber/mcabber/xmpp_helper.c
+--- a/mcabber/mcabber/xmpp_helper.c	Fri Apr 02 10:49:32 2010 +0300
++++ b/mcabber/mcabber/xmpp_helper.c	Fri Apr 02 10:50:28 2010 +0300
 @@ -232,6 +232,7 @@
    caps_add_feature("", NS_PING);
    caps_add_feature("", NS_COMMANDS);
@@ -67,9 +55,9 @@
    if (!settings_opt_get_int("iq_last_disable") &&
        (!settings_opt_get_int("iq_last_disable_when_notavail") ||
         status != notavail))
-diff -r 28e29ca86694 mcabber/mcabber/xmpp_muc.c
---- a/mcabber/mcabber/xmpp_muc.c	Fri Apr 02 02:38:41 2010 +0300
-+++ b/mcabber/mcabber/xmpp_muc.c	Fri Apr 02 10:02:21 2010 +0300
+diff -r c8ac1dfbb0cf mcabber/mcabber/xmpp_muc.c
+--- a/mcabber/mcabber/xmpp_muc.c	Fri Apr 02 10:49:32 2010 +0300
++++ b/mcabber/mcabber/xmpp_muc.c	Fri Apr 02 10:50:28 2010 +0300
 @@ -39,6 +39,8 @@
  extern enum imstatus mystatus;
  extern gchar *mystatusmsg;
@@ -173,9 +161,9 @@
    }
    // TODO
    // handle status code = 100 ( not anonymous )
-diff -r 28e29ca86694 mcabber/mcabber/xmpp_muc.h
---- a/mcabber/mcabber/xmpp_muc.h	Fri Apr 02 02:38:41 2010 +0300
-+++ b/mcabber/mcabber/xmpp_muc.h	Fri Apr 02 10:02:21 2010 +0300
+diff -r c8ac1dfbb0cf mcabber/mcabber/xmpp_muc.h
+--- a/mcabber/mcabber/xmpp_muc.h	Fri Apr 02 10:49:32 2010 +0300
++++ b/mcabber/mcabber/xmpp_muc.h	Fri Apr 02 10:50:28 2010 +0300
 @@ -6,10 +6,14 @@
    char *from;
    char *passwd;

--- a/modularize-extcmd	Fri Apr 02 10:02:50 2010 +0300
+++ b/modularize-extcmd	Fri Apr 02 10:55:37 2010 +0300
@@ -1,19 +1,7 @@
-diff -r 422b477167b9 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api	Fri Apr 02 01:50:48 2010 +0300
-+++ b/mcabber/ChangeLog.api	Fri Apr 02 01:52:13 2010 +0300
-@@ -1,3 +1,8 @@
-+
-+experimental (13)
-+
-+ * Add "timestamp" argument to hook-message-in
-+ * MQ Patch: modularize-extcmd
- 
- experimental (12)
- 
-diff -r 422b477167b9 mcabber/configure.ac
---- a/mcabber/configure.ac	Fri Apr 02 01:50:48 2010 +0300
-+++ b/mcabber/configure.ac	Fri Apr 02 01:52:13 2010 +0300
-@@ -275,6 +275,7 @@
+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
+@@ -283,6 +283,7 @@
                   modules/beep/Makefile
                   modules/xttitle/Makefile
                   modules/fifo/Makefile
@@ -21,9 +9,9 @@
                   doc/Makefile
                   doc/guide/Makefile
                   doc/help/Makefile
-diff -r 422b477167b9 mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am	Fri Apr 02 01:50:48 2010 +0300
-+++ b/mcabber/mcabber/Makefile.am	Fri Apr 02 01:52:13 2010 +0300
+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
 @@ -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 \
@@ -42,21 +30,9 @@
  endif
  
  #SUBDIRS =
-diff -r 422b477167b9 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h	Fri Apr 02 01:50:48 2010 +0300
-+++ b/mcabber/mcabber/api.h	Fri Apr 02 01:52:13 2010 +0300
-@@ -3,7 +3,7 @@
- 
- #include <mcabber/config.h> // For MCABBER_BRANCH
- 
--#define MCABBER_API_VERSION 12
-+#define MCABBER_API_VERSION 13
- #define MCABBER_API_MIN     12
- 
- extern const gchar *mcabber_branch;
-diff -r 422b477167b9 mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c	Fri Apr 02 01:50:48 2010 +0300
-+++ b/mcabber/mcabber/hooks.c	Fri Apr 02 01:52:13 2010 +0300
+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
 @@ -36,7 +36,10 @@
  #include "utf8.h"
  #include "commands.h"
@@ -79,23 +55,7 @@
    int message_flags = 0;
    guint rtype = ROSTER_TYPE_USER;
    char *wmsg = NULL, *bmsg = NULL, *mmsg = NULL;
-@@ -369,18 +374,23 @@
- 
- #ifdef MODULES_ENABLE
-   {
-+    char timestamp_str[20];
-+    if (timestamp)
-+      to_iso8601(timestamp_str, timestamp);
-     hk_arg_t args[] = {
-       { "jid", bjid },
-       { "resource", resname },
-       { "message", wmsg },
-       { "groupchat", is_groupchat ? "true" : "false" },
-       { "attention", attention ? "true" : "false" },
-+      { "timestamp", timestamp ? timestamp_str : NULL },
-       { NULL, NULL },
-     };
-     hk_run_handlers(HOOK_POST_MESSAGE_IN, args);
+@@ -385,6 +390,7 @@
    }
  #endif
  
@@ -103,7 +63,7 @@
    if (settings_opt_get_int("events_ignore_active_window") &&
        current_buddy && scr_get_chatmode()) {
      gpointer bud = BUDDATA(current_buddy);
-@@ -399,6 +409,7 @@
+@@ -403,6 +409,7 @@
      hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE,
                 is_groupchat ? EXT_CMD_INFO_GROUPCHAT : EXT_CMD_INFO_RECEIVED,
                 wmsg);
@@ -111,7 +71,7 @@
  
    // Beep, if enabled:
    // - if it's a private message
-@@ -475,8 +486,10 @@
+@@ -479,8 +486,10 @@
    }
  #endif
  
@@ -122,7 +82,7 @@
  
    g_free(bmsg);
    g_free(mmsg);
-@@ -562,9 +575,11 @@
+@@ -566,9 +575,11 @@
    }
  #endif
  
@@ -134,7 +94,7 @@
  }
  
  void hk_mystatuschange(time_t timestamp, enum imstatus old_status,
-@@ -688,11 +703,13 @@
+@@ -692,11 +703,13 @@
    prev_muc_unread    = muc_unread;
    prev_muc_attention = muc_attention;
  
@@ -148,9 +108,9 @@
  }
  
  /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
-diff -r 422b477167b9 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Fri Apr 02 01:50:48 2010 +0300
-+++ b/mcabber/mcabber/main.c	Fri Apr 02 01:52:13 2010 +0300
+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
 @@ -45,7 +45,10 @@
  #include "xmpp.h"
  #include "help.h"
@@ -175,15 +135,15 @@
  
    optstring = settings_opt_get("roster_display_filter");
    if (optstring)
-diff -r 422b477167b9 mcabber/modules/Makefile.am
---- a/mcabber/modules/Makefile.am	Fri Apr 02 01:50:48 2010 +0300
-+++ b/mcabber/modules/Makefile.am	Fri Apr 02 01:52:13 2010 +0300
+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
 @@ -1,1 +1,1 @@
 -SUBDIRS = beep xttitle fifo
 +SUBDIRS = beep xttitle fifo eventcmd
-diff -r 422b477167b9 mcabber/modules/eventcmd/Makefile.am
+diff -r dd931e80115e mcabber/modules/eventcmd/Makefile.am
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/Makefile.am	Fri Apr 02 01:52:13 2010 +0300
++++ b/mcabber/modules/eventcmd/Makefile.am	Fri Apr 02 10:49:28 2010 +0300
 @@ -0,0 +1,12 @@
 +
 +if INSTALL_HEADERS
@@ -197,9 +157,9 @@
 +				$(ENCHANT_CFLAGS)
 +endif
 +
-diff -r 422b477167b9 mcabber/modules/eventcmd/eventcmd.c
+diff -r dd931e80115e mcabber/modules/eventcmd/eventcmd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/eventcmd.c	Fri Apr 02 01:52:13 2010 +0300
++++ b/mcabber/modules/eventcmd/eventcmd.c	Fri Apr 02 10:49:28 2010 +0300
 @@ -0,0 +1,221 @@
 +
 +/* Copyright 2009 Myhailo Danylenko

--- a/series	Fri Apr 02 10:02:50 2010 +0300
+++ b/series	Fri Apr 02 10:55:37 2010 +0300
@@ -2,9 +2,12 @@
 fifo-use-guard
 modularize-fifo
 separate-extcmd
+add-hook-post-message-in-timestamp
+update-changelog-v13
 modularize-extcmd
 guard-xmpp-password
 guardize-colors
 roster-state-colors
 direct-invite
+update-changelog-v14
 muc-multiple-statuses

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/update-changelog-v13	Fri Apr 02 10:55:37 2010 +0300
@@ -0,0 +1,12 @@
+diff -r 422b477167b9 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api	Fri Apr 02 01:50:48 2010 +0300
++++ b/mcabber/ChangeLog.api	Fri Apr 02 01:52:13 2010 +0300
+@@ -1,3 +1,8 @@
++
++experimental (13)
++
++ * Add "timestamp" argument to hook-message-in
++ * MQ Patch: add-hook-post-message-in-timestamp
+ 
+ experimental (12)
+ 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/update-changelog-v14	Fri Apr 02 10:55:37 2010 +0300
@@ -0,0 +1,12 @@
+diff -r 52ef9f713809 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api	Fri Apr 02 10:50:28 2010 +0300
++++ b/mcabber/ChangeLog.api	Fri Apr 02 10:50:52 2010 +0300
+@@ -1,3 +1,8 @@
++
++experimental (14)
++
++ * Add NS_X_CONFERENCE (direct invitation)
++ * MQ Patch: direct-invite
+ 
+ experimental (13)
+