--- a/modularize-extcmd.diff Wed May 15 13:32:42 2013 +0300
+++ b/modularize-extcmd.diff Wed Nov 12 23:04:36 2014 +0200
@@ -1,9 +1,9 @@
Convert extcmd into a module
-diff -r b42512803fa8 mcabber/configure.ac
---- a/mcabber/configure.ac Thu Jan 17 23:44:36 2013 +0200
-+++ b/mcabber/configure.ac Thu Jan 17 23:45:05 2013 +0200
-@@ -292,6 +292,7 @@
+diff -r 17f90f8dc463 mcabber/configure.ac
+--- a/mcabber/configure.ac Wed Nov 12 22:24:18 2014 +0200
++++ b/mcabber/configure.ac Wed Nov 12 22:25:42 2014 +0200
+@@ -295,6 +295,7 @@
modules/beep/Makefile
modules/xttitle/Makefile
modules/fifo/Makefile
@@ -11,30 +11,31 @@
modules/urlregex/Makefile
doc/Makefile
doc/guide/Makefile
-diff -r b42512803fa8 mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am Thu Jan 17 23:44:36 2013 +0200
-+++ b/mcabber/mcabber/Makefile.am Thu Jan 17 23:45:05 2013 +0200
-@@ -7,7 +7,7 @@
+diff -r 17f90f8dc463 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am Wed Nov 12 22:24:18 2014 +0200
++++ b/mcabber/mcabber/Makefile.am Wed Nov 12 22:25:42 2014 +0200
+@@ -7,8 +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 \
xmpp_muc.c xmpp_muc.h xmpp_s10n.c xmpp_s10n.h \
-- caps.c caps.h help.c help.h extcmd.c extcmd.h
-+ caps.c caps.h help.c help.h
+- caps.c caps.h help.c help.h carbons.c carbons.h \
+- extcmd.c extcmd.h
++ caps.c caps.h help.c help.h carbons.c carbons.h
if OTR
mcabber_SOURCES += otr.c otr.h nohtml.c nohtml.h
-@@ -56,7 +56,7 @@
+@@ -57,7 +56,7 @@
mcabberincludedir = $(includedir)/mcabber
else
--mcabber_SOURCES += fifo.c fifo.h
-+mcabber_SOURCES += fifo.c fifo.h extcmd.c extcmd.h
+-mcabber_SOURCES += fifo_internal.c fifo.h
++mcabber_SOURCES += fifo_internal.c fifo.h extcmd.c extcmd.h
endif
#SUBDIRS =
-diff -r b42512803fa8 mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c Thu Jan 17 23:44:36 2013 +0200
-+++ b/mcabber/mcabber/hooks.c Thu Jan 17 23:45:05 2013 +0200
+diff -r 17f90f8dc463 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c Wed Nov 12 22:24:18 2014 +0200
++++ b/mcabber/mcabber/hooks.c Wed Nov 12 22:25:42 2014 +0200
@@ -36,7 +36,10 @@
#include "utf8.h"
#include "commands.h"
@@ -57,7 +58,7 @@
int message_flags = 0;
guint rtype = ROSTER_TYPE_USER;
char *wmsg = NULL, *bmsg = NULL, *mmsg = NULL;
-@@ -397,6 +402,7 @@
+@@ -399,6 +404,7 @@
}
#endif
@@ -65,7 +66,7 @@
if (settings_opt_get_int("events_ignore_active_window") &&
current_buddy && scr_get_chatmode()) {
gpointer bud = BUDDATA(current_buddy);
-@@ -415,6 +421,7 @@
+@@ -417,6 +423,7 @@
hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE,
is_groupchat ? EXT_CMD_INFO_GROUPCHAT : EXT_CMD_INFO_RECEIVED,
wmsg);
@@ -73,7 +74,7 @@
// Beep, if enabled:
// - if it's a private message
-@@ -491,8 +498,10 @@
+@@ -493,8 +500,10 @@
}
#endif
@@ -84,7 +85,7 @@
g_free(bmsg);
g_free(mmsg);
-@@ -578,9 +587,11 @@
+@@ -580,9 +589,11 @@
}
#endif
@@ -110,22 +111,21 @@
}
// hk_presence_subscription_request(jid, message)
-diff -r b42512803fa8 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c Thu Jan 17 23:44:36 2013 +0200
-+++ b/mcabber/mcabber/main.c Thu Jan 17 23:45:05 2013 +0200
-@@ -44,7 +44,10 @@
- #include "xmpp.h"
+diff -r 17f90f8dc463 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c Wed Nov 12 22:24:18 2014 +0200
++++ b/mcabber/mcabber/main.c Wed Nov 12 22:25:42 2014 +0200
+@@ -49,9 +49,9 @@
#include "help.h"
#include "events.h"
+ #include "compl.h"
-#include "extcmd.h"
-+
-+#ifndef MODULES_ENABLE
-+# include "extcmd.h"
-+#endif
#ifndef MODULES_ENABLE
++# include "extcmd.h"
# include "fifo.h"
-@@ -426,9 +429,11 @@
+ #endif
+
+@@ -436,9 +436,11 @@
}
#endif
@@ -137,15 +137,15 @@
optstring = settings_opt_get("roster_display_filter");
if (optstring)
-diff -r b42512803fa8 mcabber/modules/Makefile.am
---- a/mcabber/modules/Makefile.am Thu Jan 17 23:44:36 2013 +0200
-+++ b/mcabber/modules/Makefile.am Thu Jan 17 23:45:05 2013 +0200
+diff -r 17f90f8dc463 mcabber/modules/Makefile.am
+--- a/mcabber/modules/Makefile.am Wed Nov 12 22:24:18 2014 +0200
++++ b/mcabber/modules/Makefile.am Wed Nov 12 22:25:42 2014 +0200
@@ -1,1 +1,1 @@
-SUBDIRS = beep xttitle fifo urlregex
+SUBDIRS = beep xttitle fifo eventcmd urlregex
-diff -r b42512803fa8 mcabber/modules/eventcmd/Makefile.am
+diff -r 17f90f8dc463 mcabber/modules/eventcmd/Makefile.am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/Makefile.am Thu Jan 17 23:45:05 2013 +0200
++++ b/mcabber/modules/eventcmd/Makefile.am Wed Nov 12 22:25:42 2014 +0200
@@ -0,0 +1,13 @@
+
+if INSTALL_HEADERS
@@ -160,9 +160,9 @@
+ $(ENCHANT_CFLAGS)
+endif
+
-diff -r b42512803fa8 mcabber/modules/eventcmd/eventcmd.c
+diff -r 17f90f8dc463 mcabber/modules/eventcmd/eventcmd.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/eventcmd.c Thu Jan 17 23:45:05 2013 +0200
++++ b/mcabber/modules/eventcmd/eventcmd.c Wed Nov 12 22:25:42 2014 +0200
@@ -0,0 +1,221 @@
+
+/* Copyright 2009 Myhailo Danylenko