1 Move extcmd code from hooks |
1 Move extcmd code from hooks |
2 |
2 |
3 diff -r 33b2d85d27dd mcabber/mcabber/Makefile.am |
3 diff -r 75d573fb8845 mcabber/mcabber/Makefile.am |
4 --- a/mcabber/mcabber/Makefile.am Sun Jan 13 06:17:12 2013 +0200 |
4 --- a/mcabber/mcabber/Makefile.am Fri Jan 18 11:23:51 2013 +0200 |
5 +++ b/mcabber/mcabber/Makefile.am Fri Jan 18 00:10:18 2013 +0200 |
5 +++ b/mcabber/mcabber/Makefile.am Fri Jan 18 11:30:51 2013 +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 |
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_builddir)/include/config.h |
20 $(top_builddir)/include/config.h |
21 |
21 |
22 if OTR |
22 if OTR |
23 diff -r 33b2d85d27dd mcabber/mcabber/extcmd.c |
23 diff -r 75d573fb8845 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 Fri Jan 18 00:10:18 2013 +0200 |
25 +++ b/mcabber/mcabber/extcmd.c Fri Jan 18 11:30:51 2013 +0200 |
26 @@ -0,0 +1,152 @@ |
26 @@ -0,0 +1,152 @@ |
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> |
174 + } |
174 + } |
175 + g_free(datafname); |
175 + g_free(datafname); |
176 +} |
176 +} |
177 + |
177 + |
178 +/* vim: set expandtab cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */ |
178 +/* vim: set expandtab cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */ |
179 diff -r 33b2d85d27dd mcabber/mcabber/extcmd.h |
179 diff -r 75d573fb8845 mcabber/mcabber/extcmd.h |
180 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
180 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
181 +++ b/mcabber/mcabber/extcmd.h Fri Jan 18 00:10:18 2013 +0200 |
181 +++ b/mcabber/mcabber/extcmd.h Fri Jan 18 11:30:51 2013 +0200 |
182 @@ -0,0 +1,15 @@ |
182 @@ -0,0 +1,15 @@ |
183 +#ifndef __MCABBER_EXTCMD_H__ |
183 +#ifndef __MCABBER_EXTCMD_H__ |
184 +#define __MCABBER_EXTCMD_H__ 1 |
184 +#define __MCABBER_EXTCMD_H__ 1 |
185 + |
185 + |
186 +#define EXT_CMD_TYPE_MESSAGE "MSG" |
186 +#define EXT_CMD_TYPE_MESSAGE "MSG" |
193 + |
193 + |
194 +void hk_ext_cmd_init(const char *command); |
194 +void hk_ext_cmd_init(const char *command); |
195 +void hk_ext_cmd(const char *bjid, const char *type, const char *info, const char *data); |
195 +void hk_ext_cmd(const char *bjid, const char *type, const char *info, const char *data); |
196 + |
196 + |
197 +#endif |
197 +#endif |
198 diff -r 33b2d85d27dd mcabber/mcabber/hooks.c |
198 diff -r 75d573fb8845 mcabber/mcabber/hooks.c |
199 --- a/mcabber/mcabber/hooks.c Sun Jan 13 06:17:12 2013 +0200 |
199 --- a/mcabber/mcabber/hooks.c Fri Jan 18 11:23:51 2013 +0200 |
200 +++ b/mcabber/mcabber/hooks.c Fri Jan 18 00:10:18 2013 +0200 |
200 +++ b/mcabber/mcabber/hooks.c Fri Jan 18 11:30:51 2013 +0200 |
201 @@ -24,6 +24,7 @@ |
201 @@ -24,6 +24,7 @@ |
202 #include <string.h> |
202 #include <string.h> |
203 #include <sys/types.h> |
203 #include <sys/types.h> |
204 #include <unistd.h> |
204 #include <unistd.h> |
205 +#include <ctype.h> |
205 +#include <ctype.h> |
462 - } |
462 - } |
463 - g_free(datafname); |
463 - g_free(datafname); |
464 -} |
464 -} |
465 - |
465 - |
466 /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */ |
466 /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */ |
467 diff -r 33b2d85d27dd mcabber/mcabber/hooks.h |
467 diff -r 75d573fb8845 mcabber/mcabber/hooks.h |
468 --- a/mcabber/mcabber/hooks.h Sun Jan 13 06:17:12 2013 +0200 |
468 --- a/mcabber/mcabber/hooks.h Fri Jan 18 11:23:51 2013 +0200 |
469 +++ b/mcabber/mcabber/hooks.h Fri Jan 18 00:10:18 2013 +0200 |
469 +++ b/mcabber/mcabber/hooks.h Fri Jan 18 11:30:51 2013 +0200 |
470 @@ -66,9 +66,6 @@ |
470 @@ -66,9 +66,6 @@ |
471 guint hk_subscription(LmMessageSubType mstype, const gchar *bjid, |
471 guint hk_subscription(LmMessageSubType mstype, const gchar *bjid, |
472 const gchar *msg); |
472 const gchar *msg); |
473 |
473 |
474 -void hk_ext_cmd_init(const char *command); |
474 -void hk_ext_cmd_init(const char *command); |
475 -void hk_ext_cmd(const char *bjid, guchar type, guchar info, const char *data); |
475 -void hk_ext_cmd(const char *bjid, guchar type, guchar info, const char *data); |
476 - |
476 - |
477 #endif /* __MCABBER_HOOKS_H__ */ |
477 #endif /* __MCABBER_HOOKS_H__ */ |
478 |
478 |
479 /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */ |
479 /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */ |
480 diff -r 33b2d85d27dd mcabber/mcabber/main.c |
480 diff -r 75d573fb8845 mcabber/mcabber/main.c |
481 --- a/mcabber/mcabber/main.c Sun Jan 13 06:17:12 2013 +0200 |
481 --- a/mcabber/mcabber/main.c Fri Jan 18 11:23:51 2013 +0200 |
482 +++ b/mcabber/mcabber/main.c Fri Jan 18 00:10:18 2013 +0200 |
482 +++ b/mcabber/mcabber/main.c Fri Jan 18 11:30:51 2013 +0200 |
483 @@ -19,17 +19,15 @@ |
483 @@ -19,17 +19,15 @@ |
484 * USA |
484 * USA |
485 */ |
485 */ |
486 |
486 |
487 -#include <stdio.h> |
487 -#include <stdio.h> |