diff -r ac5fed257211 -r 78238d26911a separate-extcmd.diff
--- a/separate-extcmd.diff	Wed May 15 13:32:42 2013 +0300
+++ b/separate-extcmd.diff	Wed Nov 12 23:04:36 2014 +0200
@@ -1,18 +1,19 @@
 Move extcmd code from hooks
 
-diff -r 75d573fb8845 mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am	Fri Jan 18 11:23:51 2013 +0200
-+++ b/mcabber/mcabber/Makefile.am	Sun Jan 27 00:38:57 2013 +0200
-@@ -7,7 +7,7 @@
+diff -r fd72b1e3bf26 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am	Wed Nov 12 22:23:32 2014 +0200
++++ b/mcabber/mcabber/Makefile.am	Wed Nov 12 22:24:18 2014 +0200
+@@ -7,7 +7,8 @@
  		  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 \
  		  xmpp_muc.c xmpp_muc.h xmpp_s10n.c xmpp_s10n.h \
--		  caps.c caps.h help.c help.h
-+		  caps.c caps.h help.c help.h extcmd.c extcmd.h
+-		  caps.c caps.h help.c help.h carbons.c carbons.h
++		  caps.c caps.h help.c help.h carbons.c carbons.h \
++		  extcmd.c extcmd.h
  
  if OTR
  mcabber_SOURCES += otr.c otr.h nohtml.c nohtml.h
-@@ -43,6 +43,7 @@
+@@ -43,6 +44,7 @@
  			 xmpp_iq.h xmpp_iqrequest.h \
  			 xmpp_muc.h xmpp_s10n.h \
  			 caps.h fifo.h help.h modules.h api.h \
@@ -20,9 +21,9 @@
  			 $(top_builddir)/include/config.h
  
  if OTR
-diff -r 75d573fb8845 mcabber/mcabber/extcmd.c
+diff -r fd72b1e3bf26 mcabber/mcabber/extcmd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.c	Sun Jan 27 00:38:57 2013 +0200
++++ b/mcabber/mcabber/extcmd.c	Wed Nov 12 22:24:18 2014 +0200
 @@ -0,0 +1,152 @@
 +/*
 + * extcmd.c      -- External event handler command
@@ -176,9 +177,9 @@
 +}
 +
 +/* vim: set expandtab cindent cinoptions=>2\:2(0 ts=2 sw=2:  For Vim users... */
-diff -r 75d573fb8845 mcabber/mcabber/extcmd.h
+diff -r fd72b1e3bf26 mcabber/mcabber/extcmd.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.h	Sun Jan 27 00:38:57 2013 +0200
++++ b/mcabber/mcabber/extcmd.h	Wed Nov 12 22:24:18 2014 +0200
 @@ -0,0 +1,15 @@
 +#ifndef __MCABBER_EXTCMD_H__
 +#define __MCABBER_EXTCMD_H__ 1
@@ -195,9 +196,9 @@
 +void hk_ext_cmd(const char *bjid, const char *type, const char *info, const char *data);
 +
 +#endif
-diff -r 75d573fb8845 mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c	Fri Jan 18 11:23:51 2013 +0200
-+++ b/mcabber/mcabber/hooks.c	Sun Jan 27 00:38:57 2013 +0200
+diff -r fd72b1e3bf26 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c	Wed Nov 12 22:23:32 2014 +0200
++++ b/mcabber/mcabber/hooks.c	Wed Nov 12 22:24:18 2014 +0200
 @@ -24,6 +24,7 @@
  #include <string.h>
  #include <sys/types.h>
@@ -231,7 +232,7 @@
    gboolean attention = FALSE, mucprivmsg = FALSE;
    gboolean error_msg_subtype = (type == LM_MESSAGE_SUB_TYPE_ERROR);
  #ifdef MODULES_ENABLE
-@@ -373,19 +372,6 @@
+@@ -374,19 +373,6 @@
        (!is_room || (is_groupchat && log_muc_conf && !timestamp)))
      hlog_write_message(bjid, timestamp, 0, wmsg);
  
@@ -251,7 +252,7 @@
    // Display the sender in the log window
    if ((!is_groupchat) && !(message_flags & HBB_PREFIX_ERR) &&
        settings_opt_get_int("log_display_sender")) {
-@@ -411,12 +397,24 @@
+@@ -413,12 +399,24 @@
    }
  #endif
  
@@ -277,7 +278,7 @@
  
    // Beep, if enabled:
    // - if it's a private message
-@@ -494,7 +492,7 @@
+@@ -496,7 +494,7 @@
  #endif
  
    // External command
@@ -286,7 +287,7 @@
  
    g_free(bmsg);
    g_free(mmsg);
-@@ -509,10 +507,7 @@
+@@ -511,10 +509,7 @@
    char *bn;
    char *logsmsg;
    const char *rn = (resname ? resname : "");
@@ -298,7 +299,7 @@
  
    oldstat = roster_getstatus(bjid, resname);
  
-@@ -564,27 +559,28 @@
+@@ -566,27 +561,28 @@
    scr_draw_roster();
    hlog_write_status(bjid, timestamp, status, status_msg);
  
@@ -464,10 +465,10 @@
 -}
 -
  /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
-diff -r 75d573fb8845 mcabber/mcabber/hooks.h
---- a/mcabber/mcabber/hooks.h	Fri Jan 18 11:23:51 2013 +0200
-+++ b/mcabber/mcabber/hooks.h	Sun Jan 27 00:38:57 2013 +0200
-@@ -66,9 +66,6 @@
+diff -r fd72b1e3bf26 mcabber/mcabber/hooks.h
+--- a/mcabber/mcabber/hooks.h	Wed Nov 12 22:23:32 2014 +0200
++++ b/mcabber/mcabber/hooks.h	Wed Nov 12 22:24:18 2014 +0200
+@@ -67,9 +67,6 @@
  guint hk_subscription(LmMessageSubType mstype, const gchar *bjid,
                        const gchar *msg);
  
@@ -477,9 +478,9 @@
  #endif /* __MCABBER_HOOKS_H__ */
  
  /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
-diff -r 75d573fb8845 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Fri Jan 18 11:23:51 2013 +0200
-+++ b/mcabber/mcabber/main.c	Sun Jan 27 00:38:57 2013 +0200
+diff -r fd72b1e3bf26 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Wed Nov 12 22:23:32 2014 +0200
++++ b/mcabber/mcabber/main.c	Wed Nov 12 22:24:18 2014 +0200
 @@ -19,14 +19,18 @@
   * USA
   */
@@ -507,15 +508,15 @@
  #include <glib.h>
  #include <config.h>
  #include <poll.h>
-@@ -44,6 +48,7 @@
- #include "xmpp.h"
+@@ -45,6 +49,7 @@
  #include "help.h"
  #include "events.h"
+ #include "compl.h"
 +#include "extcmd.h"
  
  #ifndef MODULES_ENABLE
  # include "fifo.h"
-@@ -348,10 +353,10 @@
+@@ -351,10 +356,10 @@
        case 'h':
        case '?':
          printf("Usage: %s [-h|-V|-f mcabberrc_file]\n\n", argv[0]);
@@ -528,7 +529,7 @@
        case 'f':
          configFile = g_strdup(optarg);
          break;
-@@ -360,7 +365,7 @@
+@@ -363,7 +368,7 @@
  
    if (optind < argc) {
      fprintf(stderr, "Usage: %s [-h|-V|-f mcabberrc_file]\n\n", argv[0]);
@@ -537,7 +538,7 @@
    }
  
    /* Initialize command system, roster and default key bindings */
-@@ -529,7 +534,7 @@
+@@ -518,7 +523,7 @@
  
    printf("\n\nThanks for using mcabber!\n");