--- a/separate-extcmd Tue May 01 02:07:34 2012 +0300
+++ b/separate-extcmd Tue May 01 02:09:34 2012 +0300
@@ -1,6 +1,6 @@
-diff -r c37a4b51663b mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am Sun Jul 17 23:26:29 2011 +0300
-+++ b/mcabber/mcabber/Makefile.am Sun Jul 17 23:26:30 2011 +0300
+diff -r 64da54766f99 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am Mon Apr 30 23:36:31 2012 +0300
++++ b/mcabber/mcabber/Makefile.am Mon Apr 30 23:36:55 2012 +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 \
@@ -18,9 +18,9 @@
$(top_srcdir)/include/config.h
if OTR
-diff -r c37a4b51663b mcabber/mcabber/extcmd.c
+diff -r 64da54766f99 mcabber/mcabber/extcmd.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.c Sun Jul 17 23:26:30 2011 +0300
++++ b/mcabber/mcabber/extcmd.c Mon Apr 30 23:36:55 2012 +0300
@@ -0,0 +1,121 @@
+/*
+ * extcmd.c -- External event handler command
@@ -143,9 +143,9 @@
+}
+
+/* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */
-diff -r c37a4b51663b mcabber/mcabber/extcmd.h
+diff -r 64da54766f99 mcabber/mcabber/extcmd.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.h Sun Jul 17 23:26:30 2011 +0300
++++ b/mcabber/mcabber/extcmd.h Mon Apr 30 23:36:55 2012 +0300
@@ -0,0 +1,15 @@
+#ifndef __MCABBER_EXTCMD_H__
+#define __MCABBER_EXTCMD_H__ 1
@@ -162,9 +162,9 @@
+void hk_ext_cmd(const char *bjid, const char *type, const char *info, const char *data);
+
+#endif
-diff -r c37a4b51663b mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c Sun Jul 17 23:26:29 2011 +0300
-+++ b/mcabber/mcabber/hooks.c Sun Jul 17 23:26:30 2011 +0300
+diff -r 64da54766f99 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c Mon Apr 30 23:36:31 2012 +0300
++++ b/mcabber/mcabber/hooks.c Mon Apr 30 23:36:55 2012 +0300
@@ -24,6 +24,7 @@
#include <string.h>
#include <sys/types.h>
@@ -198,7 +198,7 @@
gboolean attention = FALSE, mucprivmsg = FALSE;
gboolean error_msg_subtype = (type == LM_MESSAGE_SUB_TYPE_ERROR);
#ifdef MODULES_ENABLE
-@@ -370,19 +369,6 @@
+@@ -373,19 +372,6 @@
(!is_room || (is_groupchat && log_muc_conf && !timestamp)))
hlog_write_message(bjid, timestamp, 0, wmsg);
@@ -218,7 +218,7 @@
// Display the sender in the log window
if ((!is_groupchat) && !(message_flags & HBB_PREFIX_ERR) &&
settings_opt_get_int("log_display_sender")) {
-@@ -408,12 +394,24 @@
+@@ -411,12 +397,24 @@
}
#endif
@@ -244,7 +244,7 @@
// Beep, if enabled:
// - if it's a private message
-@@ -491,7 +489,7 @@
+@@ -494,7 +492,7 @@
#endif
// External command
@@ -253,7 +253,7 @@
g_free(bmsg);
g_free(mmsg);
-@@ -506,10 +504,7 @@
+@@ -509,10 +507,7 @@
char *bn;
char *logsmsg;
const char *rn = (resname ? resname : "");
@@ -265,7 +265,7 @@
oldstat = roster_getstatus(bjid, resname);
-@@ -561,27 +556,28 @@
+@@ -564,27 +559,28 @@
scr_draw_roster();
hlog_write_status(bjid, timestamp, status, status_msg);
@@ -298,7 +298,7 @@
}
void hk_mystatuschange(time_t timestamp, enum imstatus old_status,
-@@ -708,7 +704,7 @@
+@@ -711,7 +707,7 @@
/* Call external command */
str_unread = g_strdup_printf("%u %u %u %u", unread_count, attention_count,
muc_unread, muc_attention);
@@ -307,7 +307,7 @@
g_free(str_unread);
}
-@@ -748,123 +744,4 @@
+@@ -751,123 +747,4 @@
return 0;
}
@@ -431,9 +431,9 @@
-}
-
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
-diff -r c37a4b51663b mcabber/mcabber/hooks.h
---- a/mcabber/mcabber/hooks.h Sun Jul 17 23:26:29 2011 +0300
-+++ b/mcabber/mcabber/hooks.h Sun Jul 17 23:26:30 2011 +0300
+diff -r 64da54766f99 mcabber/mcabber/hooks.h
+--- a/mcabber/mcabber/hooks.h Mon Apr 30 23:36:31 2012 +0300
++++ b/mcabber/mcabber/hooks.h Mon Apr 30 23:36:55 2012 +0300
@@ -66,9 +66,6 @@
guint hk_subscription(LmMessageSubType mstype, const gchar *bjid,
const gchar *msg);
@@ -444,9 +444,9 @@
#endif /* __MCABBER_HOOKS_H__ */
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
-diff -r c37a4b51663b mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c Sun Jul 17 23:26:29 2011 +0300
-+++ b/mcabber/mcabber/main.c Sun Jul 17 23:26:30 2011 +0300
+diff -r 64da54766f99 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c Mon Apr 30 23:36:31 2012 +0300
++++ b/mcabber/mcabber/main.c Mon Apr 30 23:36:55 2012 +0300
@@ -44,6 +44,7 @@
#include "xmpp.h"
#include "help.h"