--- a/separate-extcmd.diff Fri Jan 18 11:28:35 2013 +0200
+++ b/separate-extcmd.diff Fri Jan 18 11:32:15 2013 +0200
@@ -1,8 +1,8 @@
Move extcmd code from hooks
-diff -r 33b2d85d27dd mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am Sun Jan 13 06:17:12 2013 +0200
-+++ b/mcabber/mcabber/Makefile.am Fri Jan 18 00:10:18 2013 +0200
+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 Fri Jan 18 11:30:51 2013 +0200
@@ -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 \
@@ -20,9 +20,9 @@
$(top_builddir)/include/config.h
if OTR
-diff -r 33b2d85d27dd mcabber/mcabber/extcmd.c
+diff -r 75d573fb8845 mcabber/mcabber/extcmd.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.c Fri Jan 18 00:10:18 2013 +0200
++++ b/mcabber/mcabber/extcmd.c Fri Jan 18 11:30:51 2013 +0200
@@ -0,0 +1,152 @@
+/*
+ * extcmd.c -- External event handler command
@@ -98,7 +98,7 @@
+ extcmd = NULL;
+ }
+ if (command) {
-+ signal(SIGCHLD, sig_handler);
++ signal(SIGCHLD, ext_sig_handler);
+ extcmd = expand_filename(command);
+ }
+}
@@ -176,9 +176,9 @@
+}
+
+/* vim: set expandtab cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */
-diff -r 33b2d85d27dd mcabber/mcabber/extcmd.h
+diff -r 75d573fb8845 mcabber/mcabber/extcmd.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.h Fri Jan 18 00:10:18 2013 +0200
++++ b/mcabber/mcabber/extcmd.h Fri Jan 18 11:30:51 2013 +0200
@@ -0,0 +1,15 @@
+#ifndef __MCABBER_EXTCMD_H__
+#define __MCABBER_EXTCMD_H__ 1
@@ -195,9 +195,9 @@
+void hk_ext_cmd(const char *bjid, const char *type, const char *info, const char *data);
+
+#endif
-diff -r 33b2d85d27dd mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c Sun Jan 13 06:17:12 2013 +0200
-+++ b/mcabber/mcabber/hooks.c Fri Jan 18 00:10:18 2013 +0200
+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 Fri Jan 18 11:30:51 2013 +0200
@@ -24,6 +24,7 @@
#include <string.h>
#include <sys/types.h>
@@ -464,9 +464,9 @@
-}
-
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
-diff -r 33b2d85d27dd mcabber/mcabber/hooks.h
---- a/mcabber/mcabber/hooks.h Sun Jan 13 06:17:12 2013 +0200
-+++ b/mcabber/mcabber/hooks.h Fri Jan 18 00:10:18 2013 +0200
+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 Fri Jan 18 11:30:51 2013 +0200
@@ -66,9 +66,6 @@
guint hk_subscription(LmMessageSubType mstype, const gchar *bjid,
const gchar *msg);
@@ -477,9 +477,9 @@
#endif /* __MCABBER_HOOKS_H__ */
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
-diff -r 33b2d85d27dd mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c Sun Jan 13 06:17:12 2013 +0200
-+++ b/mcabber/mcabber/main.c Fri Jan 18 00:10:18 2013 +0200
+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 Fri Jan 18 11:30:51 2013 +0200
@@ -19,17 +19,15 @@
* USA
*/