--- a/separate-extcmd.diff Fri Mar 04 15:57:04 2016 +0200
+++ b/separate-extcmd.diff Fri Dec 09 02:12:34 2016 +0200
@@ -1,8 +1,10 @@
+# HG changeset patch
+# Parent 4eeccf092a681b87a1a9d53f7de321f7653e1489
Move extcmd code from hooks
-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
+diff -r 4eeccf092a68 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am Fri Dec 09 01:38:25 2016 +0200
++++ b/mcabber/mcabber/Makefile.am Fri Dec 09 01:48:53 2016 +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 \
@@ -21,9 +23,9 @@
$(top_builddir)/include/config.h
if OTR
-diff -r fd72b1e3bf26 mcabber/mcabber/extcmd.c
+diff -r 4eeccf092a68 mcabber/mcabber/extcmd.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.c Wed Nov 12 22:24:18 2014 +0200
++++ b/mcabber/mcabber/extcmd.c Fri Dec 09 01:48:53 2016 +0200
@@ -0,0 +1,152 @@
+/*
+ * extcmd.c -- External event handler command
@@ -177,9 +179,9 @@
+}
+
+/* vim: set expandtab cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */
-diff -r fd72b1e3bf26 mcabber/mcabber/extcmd.h
+diff -r 4eeccf092a68 mcabber/mcabber/extcmd.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.h Wed Nov 12 22:24:18 2014 +0200
++++ b/mcabber/mcabber/extcmd.h Fri Dec 09 01:48:53 2016 +0200
@@ -0,0 +1,15 @@
+#ifndef __MCABBER_EXTCMD_H__
+#define __MCABBER_EXTCMD_H__ 1
@@ -196,10 +198,10 @@
+void hk_ext_cmd(const char *bjid, const char *type, const char *info, const char *data);
+
+#endif
-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 @@
+diff -r 4eeccf092a68 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c Fri Dec 09 01:38:25 2016 +0200
++++ b/mcabber/mcabber/hooks.c Fri Dec 09 01:48:53 2016 +0200
+@@ -22,6 +22,7 @@
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
@@ -207,7 +209,7 @@
#include "hooks.h"
#include "screen.h"
-@@ -35,6 +36,7 @@
+@@ -33,6 +34,7 @@
#include "utf8.h"
#include "commands.h"
#include "main.h"
@@ -232,7 +234,7 @@
gboolean attention = FALSE, mucprivmsg = FALSE;
gboolean error_msg_subtype = (type == LM_MESSAGE_SUB_TYPE_ERROR);
#ifdef MODULES_ENABLE
-@@ -374,19 +373,6 @@
+@@ -377,19 +376,6 @@
(!is_room || (is_groupchat && log_muc_conf && !timestamp)))
hlog_write_message(bjid, timestamp, 0, wmsg);
@@ -252,7 +254,7 @@
// Display the sender in the log window
if ((!is_groupchat) && !(message_flags & HBB_PREFIX_ERR) &&
settings_opt_get_int("log_display_sender")) {
-@@ -413,12 +399,24 @@
+@@ -416,12 +402,24 @@
}
#endif
@@ -278,7 +280,7 @@
// Beep, if enabled:
// - if it's a private message
-@@ -496,7 +494,7 @@
+@@ -503,7 +501,7 @@
#endif
// External command
@@ -287,7 +289,7 @@
g_free(bmsg);
g_free(mmsg);
-@@ -511,10 +509,7 @@
+@@ -518,10 +516,7 @@
char *bn;
char *logsmsg;
const char *rn = (resname ? resname : "");
@@ -299,8 +301,8 @@
oldstat = roster_getstatus(bjid, resname);
-@@ -566,27 +561,28 @@
- scr_draw_roster();
+@@ -572,27 +567,28 @@
+ build_buddylist = TRUE;
hlog_write_status(bjid, timestamp, status, status_msg);
+ newstatus[0] = imstatus2char[status];
@@ -332,7 +334,7 @@
}
void hk_mystatuschange(time_t timestamp, enum imstatus old_status,
-@@ -711,7 +707,7 @@
+@@ -717,7 +713,7 @@
/* Call external command */
str_unread = g_strdup_printf("%u %u %u %u", unread_count, attention_count,
muc_unread, muc_attention);
@@ -341,7 +343,7 @@
g_free(str_unread);
}
-@@ -751,123 +747,4 @@
+@@ -757,123 +753,4 @@
return 0;
}
@@ -465,9 +467,9 @@
-}
-
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
-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
+diff -r 4eeccf092a68 mcabber/mcabber/hooks.h
+--- a/mcabber/mcabber/hooks.h Fri Dec 09 01:38:25 2016 +0200
++++ b/mcabber/mcabber/hooks.h Fri Dec 09 01:48:53 2016 +0200
@@ -67,9 +67,6 @@
guint hk_subscription(LmMessageSubType mstype, const gchar *bjid,
const gchar *msg);
@@ -478,11 +480,11 @@
#endif /* __MCABBER_HOOKS_H__ */
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
-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
+diff -r 4eeccf092a68 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c Fri Dec 09 01:38:25 2016 +0200
++++ b/mcabber/mcabber/main.c Fri Dec 09 01:48:53 2016 +0200
+@@ -17,14 +17,18 @@
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdio.h>
@@ -516,7 +518,7 @@
#ifndef MODULES_ENABLE
# include "fifo.h"
-@@ -351,10 +356,10 @@
+@@ -425,10 +430,10 @@
case 'h':
case '?':
printf("Usage: %s [-h|-V|-f mcabberrc_file]\n\n", argv[0]);
@@ -529,7 +531,7 @@
case 'f':
configFile = g_strdup(optarg);
break;
-@@ -363,7 +368,7 @@
+@@ -437,7 +442,7 @@
if (optind < argc) {
fprintf(stderr, "Usage: %s [-h|-V|-f mcabberrc_file]\n\n", argv[0]);
@@ -538,7 +540,7 @@
}
/* Initialize command system, roster and default key bindings */
-@@ -518,7 +523,7 @@
+@@ -644,7 +649,7 @@
printf("\n\nThanks for using mcabber!\n");