--- a/separate-extcmd Tue Apr 13 01:37:44 2010 +0300
+++ b/separate-extcmd Fri Apr 23 13:11:40 2010 +0300
@@ -1,6 +1,6 @@
-diff -r bb1396d6ba03 mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am Fri Apr 02 00:06:58 2010 +0300
-+++ b/mcabber/mcabber/Makefile.am Fri Apr 02 01:50:48 2010 +0300
+diff -r 6cd06329c5e8 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am Fri Apr 23 12:52:18 2010 +0300
++++ b/mcabber/mcabber/Makefile.am Fri Apr 23 12:55:35 2010 +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 bb1396d6ba03 mcabber/mcabber/extcmd.c
+diff -r 6cd06329c5e8 mcabber/mcabber/extcmd.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.c Fri Apr 02 01:50:48 2010 +0300
++++ b/mcabber/mcabber/extcmd.c Fri Apr 23 12:55:35 2010 +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 bb1396d6ba03 mcabber/mcabber/extcmd.h
+diff -r 6cd06329c5e8 mcabber/mcabber/extcmd.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.h Fri Apr 02 01:50:48 2010 +0300
++++ b/mcabber/mcabber/extcmd.h Fri Apr 23 12:55:35 2010 +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 bb1396d6ba03 mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c Fri Apr 02 00:06:58 2010 +0300
-+++ b/mcabber/mcabber/hooks.c Fri Apr 02 01:50:48 2010 +0300
+diff -r 6cd06329c5e8 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c Fri Apr 23 12:52:18 2010 +0300
++++ b/mcabber/mcabber/hooks.c Fri Apr 23 12:55:35 2010 +0300
@@ -24,6 +24,7 @@
#include <string.h>
#include <sys/types.h>
@@ -196,9 +196,9 @@
unsigned mucnicklen = 0;
- const char *ename = NULL;
gboolean attention = FALSE, mucprivmsg = FALSE;
-
- if (encrypted == ENCRYPTED_PGP)
-@@ -359,19 +358,6 @@
+ #ifdef MODULES_ENABLE
+ gchar strdelay[32];
+@@ -368,19 +367,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")) {
-@@ -395,12 +381,24 @@
+@@ -405,12 +391,24 @@
}
#endif
@@ -244,7 +244,7 @@
// Beep, if enabled:
// - if it's a private message
-@@ -478,7 +476,7 @@
+@@ -488,7 +486,7 @@
#endif
// External command
@@ -253,7 +253,7 @@
g_free(bmsg);
g_free(mmsg);
-@@ -493,10 +491,7 @@
+@@ -503,10 +501,7 @@
char *bn;
char *logsmsg;
const char *rn = (resname ? resname : "");
@@ -265,7 +265,7 @@
oldstat = roster_getstatus(bjid, resname);
-@@ -548,27 +543,28 @@
+@@ -558,27 +553,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,
-@@ -695,127 +691,8 @@
+@@ -705,7 +701,7 @@
/* Call external command */
str_unread = g_strdup_printf("%u %u %u %u", unread_count, attention_count,
muc_unread, muc_attention);
@@ -307,6 +307,10 @@
g_free(str_unread);
}
+@@ -745,123 +741,4 @@
+ return 0;
+ }
+
-
-/* External commands */
-
@@ -427,12 +431,12 @@
-}
-
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
-diff -r bb1396d6ba03 mcabber/mcabber/hooks.h
---- a/mcabber/mcabber/hooks.h Fri Apr 02 00:06:58 2010 +0300
-+++ b/mcabber/mcabber/hooks.h Fri Apr 02 01:50:48 2010 +0300
-@@ -62,9 +62,6 @@
- void hk_unread_list_change(guint unread_count, guint attention_count,
- guint muc_unread, guint muc_attention);
+diff -r 6cd06329c5e8 mcabber/mcabber/hooks.h
+--- a/mcabber/mcabber/hooks.h Fri Apr 23 12:52:18 2010 +0300
++++ b/mcabber/mcabber/hooks.h Fri Apr 23 12:55:35 2010 +0300
+@@ -66,9 +66,6 @@
+ guint hk_subscription(LmMessageSubType mstype, const gchar *bjid,
+ const gchar *msg);
-void hk_ext_cmd_init(const char *command);
-void hk_ext_cmd(const char *bjid, guchar type, guchar info, const char *data);
@@ -440,10 +444,10 @@
#endif /* __MCABBER_HOOKS_H__ */
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
-diff -r bb1396d6ba03 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c Fri Apr 02 00:06:58 2010 +0300
-+++ b/mcabber/mcabber/main.c Fri Apr 02 01:50:48 2010 +0300
-@@ -45,6 +45,7 @@
+diff -r 6cd06329c5e8 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c Fri Apr 23 12:52:18 2010 +0300
++++ b/mcabber/mcabber/main.c Fri Apr 23 12:55:35 2010 +0300
+@@ -44,6 +44,7 @@
#include "xmpp.h"
#include "help.h"
#include "events.h"