1 Move extcmd code from hooks |
1 Move extcmd code from hooks |
2 |
2 |
3 diff -r 64da54766f99 mcabber/mcabber/Makefile.am |
3 diff -r c6f9fa178a53 mcabber/mcabber/Makefile.am |
4 --- a/mcabber/mcabber/Makefile.am Mon Apr 30 23:36:31 2012 +0300 |
4 --- a/mcabber/mcabber/Makefile.am Thu Nov 22 00:52:37 2012 +0200 |
5 +++ b/mcabber/mcabber/Makefile.am Mon Apr 30 23:36:55 2012 +0300 |
5 +++ b/mcabber/mcabber/Makefile.am Thu Nov 22 00:53:15 2012 +0200 |
6 @@ -7,7 +7,7 @@ |
6 @@ -7,7 +7,7 @@ |
7 xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \ |
7 xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \ |
8 xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \ |
8 xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \ |
9 xmpp_muc.c xmpp_muc.h xmpp_s10n.c xmpp_s10n.h \ |
9 xmpp_muc.c xmpp_muc.h xmpp_s10n.c xmpp_s10n.h \ |
10 - caps.c caps.h help.c help.h |
10 - caps.c caps.h help.c help.h |
11 + caps.c caps.h help.c help.h extcmd.c extcmd.h |
11 + caps.c caps.h help.c help.h extcmd.c extcmd.h |
12 |
12 |
13 if OTR |
13 if OTR |
14 mcabber_SOURCES += otr.c otr.h nohtml.c nohtml.h |
14 mcabber_SOURCES += otr.c otr.h nohtml.c nohtml.h |
15 @@ -42,6 +42,7 @@ |
15 @@ -43,6 +43,7 @@ |
16 xmpp_iq.h xmpp_iqrequest.h \ |
16 xmpp_iq.h xmpp_iqrequest.h \ |
17 xmpp_muc.h xmpp_s10n.h \ |
17 xmpp_muc.h xmpp_s10n.h \ |
18 caps.h fifo.h help.h modules.h api.h \ |
18 caps.h fifo.h help.h modules.h api.h \ |
19 + extcmd.h \ |
19 + extcmd.h \ |
20 $(top_srcdir)/include/config.h |
20 $(top_builddir)/include/config.h |
21 |
21 |
22 if OTR |
22 if OTR |
23 diff -r 64da54766f99 mcabber/mcabber/extcmd.c |
23 diff -r c6f9fa178a53 mcabber/mcabber/extcmd.c |
24 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
24 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
25 +++ b/mcabber/mcabber/extcmd.c Mon Apr 30 23:36:55 2012 +0300 |
25 +++ b/mcabber/mcabber/extcmd.c Thu Nov 22 00:53:15 2012 +0200 |
26 @@ -0,0 +1,121 @@ |
26 @@ -0,0 +1,121 @@ |
27 +/* |
27 +/* |
28 + * extcmd.c -- External event handler command |
28 + * extcmd.c -- External event handler command |
29 + * |
29 + * |
30 + * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> |
30 + * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> |
143 + } |
143 + } |
144 + g_free(datafname); |
144 + g_free(datafname); |
145 +} |
145 +} |
146 + |
146 + |
147 +/* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */ |
147 +/* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */ |
148 diff -r 64da54766f99 mcabber/mcabber/extcmd.h |
148 diff -r c6f9fa178a53 mcabber/mcabber/extcmd.h |
149 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
149 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
150 +++ b/mcabber/mcabber/extcmd.h Mon Apr 30 23:36:55 2012 +0300 |
150 +++ b/mcabber/mcabber/extcmd.h Thu Nov 22 00:53:15 2012 +0200 |
151 @@ -0,0 +1,15 @@ |
151 @@ -0,0 +1,15 @@ |
152 +#ifndef __MCABBER_EXTCMD_H__ |
152 +#ifndef __MCABBER_EXTCMD_H__ |
153 +#define __MCABBER_EXTCMD_H__ 1 |
153 +#define __MCABBER_EXTCMD_H__ 1 |
154 + |
154 + |
155 +#define EXT_CMD_TYPE_MESSAGE "MSG" |
155 +#define EXT_CMD_TYPE_MESSAGE "MSG" |
162 + |
162 + |
163 +void hk_ext_cmd_init(const char *command); |
163 +void hk_ext_cmd_init(const char *command); |
164 +void hk_ext_cmd(const char *bjid, const char *type, const char *info, const char *data); |
164 +void hk_ext_cmd(const char *bjid, const char *type, const char *info, const char *data); |
165 + |
165 + |
166 +#endif |
166 +#endif |
167 diff -r 64da54766f99 mcabber/mcabber/hooks.c |
167 diff -r c6f9fa178a53 mcabber/mcabber/hooks.c |
168 --- a/mcabber/mcabber/hooks.c Mon Apr 30 23:36:31 2012 +0300 |
168 --- a/mcabber/mcabber/hooks.c Thu Nov 22 00:52:37 2012 +0200 |
169 +++ b/mcabber/mcabber/hooks.c Mon Apr 30 23:36:55 2012 +0300 |
169 +++ b/mcabber/mcabber/hooks.c Thu Nov 22 00:53:15 2012 +0200 |
170 @@ -24,6 +24,7 @@ |
170 @@ -24,6 +24,7 @@ |
171 #include <string.h> |
171 #include <string.h> |
172 #include <sys/types.h> |
172 #include <sys/types.h> |
173 #include <unistd.h> |
173 #include <unistd.h> |
174 +#include <ctype.h> |
174 +#include <ctype.h> |
431 - } |
431 - } |
432 - g_free(datafname); |
432 - g_free(datafname); |
433 -} |
433 -} |
434 - |
434 - |
435 /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */ |
435 /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */ |
436 diff -r 64da54766f99 mcabber/mcabber/hooks.h |
436 diff -r c6f9fa178a53 mcabber/mcabber/hooks.h |
437 --- a/mcabber/mcabber/hooks.h Mon Apr 30 23:36:31 2012 +0300 |
437 --- a/mcabber/mcabber/hooks.h Thu Nov 22 00:52:37 2012 +0200 |
438 +++ b/mcabber/mcabber/hooks.h Mon Apr 30 23:36:55 2012 +0300 |
438 +++ b/mcabber/mcabber/hooks.h Thu Nov 22 00:53:15 2012 +0200 |
439 @@ -66,9 +66,6 @@ |
439 @@ -66,9 +66,6 @@ |
440 guint hk_subscription(LmMessageSubType mstype, const gchar *bjid, |
440 guint hk_subscription(LmMessageSubType mstype, const gchar *bjid, |
441 const gchar *msg); |
441 const gchar *msg); |
442 |
442 |
443 -void hk_ext_cmd_init(const char *command); |
443 -void hk_ext_cmd_init(const char *command); |
444 -void hk_ext_cmd(const char *bjid, guchar type, guchar info, const char *data); |
444 -void hk_ext_cmd(const char *bjid, guchar type, guchar info, const char *data); |
445 - |
445 - |
446 #endif /* __MCABBER_HOOKS_H__ */ |
446 #endif /* __MCABBER_HOOKS_H__ */ |
447 |
447 |
448 /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */ |
448 /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */ |
449 diff -r 64da54766f99 mcabber/mcabber/main.c |
449 diff -r c6f9fa178a53 mcabber/mcabber/main.c |
450 --- a/mcabber/mcabber/main.c Mon Apr 30 23:36:31 2012 +0300 |
450 --- a/mcabber/mcabber/main.c Thu Nov 22 00:52:37 2012 +0200 |
451 +++ b/mcabber/mcabber/main.c Mon Apr 30 23:36:55 2012 +0300 |
451 +++ b/mcabber/mcabber/main.c Thu Nov 22 00:53:15 2012 +0200 |
452 @@ -44,6 +44,7 @@ |
452 @@ -44,6 +44,7 @@ |
453 #include "xmpp.h" |
453 #include "xmpp.h" |
454 #include "help.h" |
454 #include "help.h" |
455 #include "events.h" |
455 #include "events.h" |
456 +#include "extcmd.h" |
456 +#include "extcmd.h" |