1 Convert extcmd into a module |
1 Convert extcmd into a module |
2 |
2 |
3 diff -r b42512803fa8 mcabber/configure.ac |
3 diff -r 17f90f8dc463 mcabber/configure.ac |
4 --- a/mcabber/configure.ac Thu Jan 17 23:44:36 2013 +0200 |
4 --- a/mcabber/configure.ac Wed Nov 12 22:24:18 2014 +0200 |
5 +++ b/mcabber/configure.ac Thu Jan 17 23:45:05 2013 +0200 |
5 +++ b/mcabber/configure.ac Wed Nov 12 22:25:42 2014 +0200 |
6 @@ -292,6 +292,7 @@ |
6 @@ -295,6 +295,7 @@ |
7 modules/beep/Makefile |
7 modules/beep/Makefile |
8 modules/xttitle/Makefile |
8 modules/xttitle/Makefile |
9 modules/fifo/Makefile |
9 modules/fifo/Makefile |
10 + modules/eventcmd/Makefile |
10 + modules/eventcmd/Makefile |
11 modules/urlregex/Makefile |
11 modules/urlregex/Makefile |
12 doc/Makefile |
12 doc/Makefile |
13 doc/guide/Makefile |
13 doc/guide/Makefile |
14 diff -r b42512803fa8 mcabber/mcabber/Makefile.am |
14 diff -r 17f90f8dc463 mcabber/mcabber/Makefile.am |
15 --- a/mcabber/mcabber/Makefile.am Thu Jan 17 23:44:36 2013 +0200 |
15 --- a/mcabber/mcabber/Makefile.am Wed Nov 12 22:24:18 2014 +0200 |
16 +++ b/mcabber/mcabber/Makefile.am Thu Jan 17 23:45:05 2013 +0200 |
16 +++ b/mcabber/mcabber/Makefile.am Wed Nov 12 22:25:42 2014 +0200 |
17 @@ -7,7 +7,7 @@ |
17 @@ -7,8 +7,7 @@ |
18 xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \ |
18 xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \ |
19 xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \ |
19 xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \ |
20 xmpp_muc.c xmpp_muc.h xmpp_s10n.c xmpp_s10n.h \ |
20 xmpp_muc.c xmpp_muc.h xmpp_s10n.c xmpp_s10n.h \ |
21 - caps.c caps.h help.c help.h extcmd.c extcmd.h |
21 - caps.c caps.h help.c help.h carbons.c carbons.h \ |
22 + caps.c caps.h help.c help.h |
22 - extcmd.c extcmd.h |
|
23 + caps.c caps.h help.c help.h carbons.c carbons.h |
23 |
24 |
24 if OTR |
25 if OTR |
25 mcabber_SOURCES += otr.c otr.h nohtml.c nohtml.h |
26 mcabber_SOURCES += otr.c otr.h nohtml.c nohtml.h |
26 @@ -56,7 +56,7 @@ |
27 @@ -57,7 +56,7 @@ |
27 |
28 |
28 mcabberincludedir = $(includedir)/mcabber |
29 mcabberincludedir = $(includedir)/mcabber |
29 else |
30 else |
30 -mcabber_SOURCES += fifo.c fifo.h |
31 -mcabber_SOURCES += fifo_internal.c fifo.h |
31 +mcabber_SOURCES += fifo.c fifo.h extcmd.c extcmd.h |
32 +mcabber_SOURCES += fifo_internal.c fifo.h extcmd.c extcmd.h |
32 endif |
33 endif |
33 |
34 |
34 #SUBDIRS = |
35 #SUBDIRS = |
35 diff -r b42512803fa8 mcabber/mcabber/hooks.c |
36 diff -r 17f90f8dc463 mcabber/mcabber/hooks.c |
36 --- a/mcabber/mcabber/hooks.c Thu Jan 17 23:44:36 2013 +0200 |
37 --- a/mcabber/mcabber/hooks.c Wed Nov 12 22:24:18 2014 +0200 |
37 +++ b/mcabber/mcabber/hooks.c Thu Jan 17 23:45:05 2013 +0200 |
38 +++ b/mcabber/mcabber/hooks.c Wed Nov 12 22:25:42 2014 +0200 |
38 @@ -36,7 +36,10 @@ |
39 @@ -36,7 +36,10 @@ |
39 #include "utf8.h" |
40 #include "utf8.h" |
40 #include "commands.h" |
41 #include "commands.h" |
41 #include "main.h" |
42 #include "main.h" |
42 -#include "extcmd.h" |
43 -#include "extcmd.h" |
55 int active_window = FALSE; |
56 int active_window = FALSE; |
56 +#endif |
57 +#endif |
57 int message_flags = 0; |
58 int message_flags = 0; |
58 guint rtype = ROSTER_TYPE_USER; |
59 guint rtype = ROSTER_TYPE_USER; |
59 char *wmsg = NULL, *bmsg = NULL, *mmsg = NULL; |
60 char *wmsg = NULL, *bmsg = NULL, *mmsg = NULL; |
60 @@ -397,6 +402,7 @@ |
61 @@ -399,6 +404,7 @@ |
61 } |
62 } |
62 #endif |
63 #endif |
63 |
64 |
64 +#ifndef MODULES_ENABLE |
65 +#ifndef MODULES_ENABLE |
65 if (settings_opt_get_int("events_ignore_active_window") && |
66 if (settings_opt_get_int("events_ignore_active_window") && |
66 current_buddy && scr_get_chatmode()) { |
67 current_buddy && scr_get_chatmode()) { |
67 gpointer bud = BUDDATA(current_buddy); |
68 gpointer bud = BUDDATA(current_buddy); |
68 @@ -415,6 +421,7 @@ |
69 @@ -417,6 +423,7 @@ |
69 hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE, |
70 hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE, |
70 is_groupchat ? EXT_CMD_INFO_GROUPCHAT : EXT_CMD_INFO_RECEIVED, |
71 is_groupchat ? EXT_CMD_INFO_GROUPCHAT : EXT_CMD_INFO_RECEIVED, |
71 wmsg); |
72 wmsg); |
72 +#endif |
73 +#endif |
73 |
74 |
74 // Beep, if enabled: |
75 // Beep, if enabled: |
75 // - if it's a private message |
76 // - if it's a private message |
76 @@ -491,8 +498,10 @@ |
77 @@ -493,8 +500,10 @@ |
77 } |
78 } |
78 #endif |
79 #endif |
79 |
80 |
80 +#ifndef MODULES_ENABLE |
81 +#ifndef MODULES_ENABLE |
81 // External command |
82 // External command |
82 hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE, EXT_CMD_INFO_SENT, NULL); |
83 hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE, EXT_CMD_INFO_SENT, NULL); |
83 +#endif |
84 +#endif |
84 |
85 |
85 g_free(bmsg); |
86 g_free(bmsg); |
86 g_free(mmsg); |
87 g_free(mmsg); |
87 @@ -578,9 +587,11 @@ |
88 @@ -580,9 +589,11 @@ |
88 } |
89 } |
89 #endif |
90 #endif |
90 |
91 |
91 +#ifndef MODULES_ENABLE |
92 +#ifndef MODULES_ENABLE |
92 // External command |
93 // External command |
108 g_free(str_unread); |
109 g_free(str_unread); |
109 +#endif |
110 +#endif |
110 } |
111 } |
111 |
112 |
112 // hk_presence_subscription_request(jid, message) |
113 // hk_presence_subscription_request(jid, message) |
113 diff -r b42512803fa8 mcabber/mcabber/main.c |
114 diff -r 17f90f8dc463 mcabber/mcabber/main.c |
114 --- a/mcabber/mcabber/main.c Thu Jan 17 23:44:36 2013 +0200 |
115 --- a/mcabber/mcabber/main.c Wed Nov 12 22:24:18 2014 +0200 |
115 +++ b/mcabber/mcabber/main.c Thu Jan 17 23:45:05 2013 +0200 |
116 +++ b/mcabber/mcabber/main.c Wed Nov 12 22:25:42 2014 +0200 |
116 @@ -44,7 +44,10 @@ |
117 @@ -49,9 +49,9 @@ |
117 #include "xmpp.h" |
|
118 #include "help.h" |
118 #include "help.h" |
119 #include "events.h" |
119 #include "events.h" |
|
120 #include "compl.h" |
120 -#include "extcmd.h" |
121 -#include "extcmd.h" |
121 + |
122 |
122 +#ifndef MODULES_ENABLE |
123 #ifndef MODULES_ENABLE |
123 +# include "extcmd.h" |
124 +# include "extcmd.h" |
124 +#endif |
|
125 |
|
126 #ifndef MODULES_ENABLE |
|
127 # include "fifo.h" |
125 # include "fifo.h" |
128 @@ -426,9 +429,11 @@ |
126 #endif |
|
127 |
|
128 @@ -436,9 +436,11 @@ |
129 } |
129 } |
130 #endif |
130 #endif |
131 |
131 |
132 +#ifndef MODULES_ENABLE |
132 +#ifndef MODULES_ENABLE |
133 optstring = settings_opt_get("events_command"); |
133 optstring = settings_opt_get("events_command"); |
135 hk_ext_cmd_init(optstring); |
135 hk_ext_cmd_init(optstring); |
136 +#endif |
136 +#endif |
137 |
137 |
138 optstring = settings_opt_get("roster_display_filter"); |
138 optstring = settings_opt_get("roster_display_filter"); |
139 if (optstring) |
139 if (optstring) |
140 diff -r b42512803fa8 mcabber/modules/Makefile.am |
140 diff -r 17f90f8dc463 mcabber/modules/Makefile.am |
141 --- a/mcabber/modules/Makefile.am Thu Jan 17 23:44:36 2013 +0200 |
141 --- a/mcabber/modules/Makefile.am Wed Nov 12 22:24:18 2014 +0200 |
142 +++ b/mcabber/modules/Makefile.am Thu Jan 17 23:45:05 2013 +0200 |
142 +++ b/mcabber/modules/Makefile.am Wed Nov 12 22:25:42 2014 +0200 |
143 @@ -1,1 +1,1 @@ |
143 @@ -1,1 +1,1 @@ |
144 -SUBDIRS = beep xttitle fifo urlregex |
144 -SUBDIRS = beep xttitle fifo urlregex |
145 +SUBDIRS = beep xttitle fifo eventcmd urlregex |
145 +SUBDIRS = beep xttitle fifo eventcmd urlregex |
146 diff -r b42512803fa8 mcabber/modules/eventcmd/Makefile.am |
146 diff -r 17f90f8dc463 mcabber/modules/eventcmd/Makefile.am |
147 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
147 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
148 +++ b/mcabber/modules/eventcmd/Makefile.am Thu Jan 17 23:45:05 2013 +0200 |
148 +++ b/mcabber/modules/eventcmd/Makefile.am Wed Nov 12 22:25:42 2014 +0200 |
149 @@ -0,0 +1,13 @@ |
149 @@ -0,0 +1,13 @@ |
150 + |
150 + |
151 +if INSTALL_HEADERS |
151 +if INSTALL_HEADERS |
152 +pkglib_LTLIBRARIES = libeventcmd.la |
152 +pkglib_LTLIBRARIES = libeventcmd.la |
153 +libeventcmd_la_SOURCES = eventcmd.c $(top_srcdir)/mcabber/extcmd.c $(top_srcdir)/mcabber/extcmd.h |
153 +libeventcmd_la_SOURCES = eventcmd.c $(top_srcdir)/mcabber/extcmd.c $(top_srcdir)/mcabber/extcmd.h |
158 + $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \ |
158 + $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \ |
159 + $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \ |
159 + $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \ |
160 + $(ENCHANT_CFLAGS) |
160 + $(ENCHANT_CFLAGS) |
161 +endif |
161 +endif |
162 + |
162 + |
163 diff -r b42512803fa8 mcabber/modules/eventcmd/eventcmd.c |
163 diff -r 17f90f8dc463 mcabber/modules/eventcmd/eventcmd.c |
164 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
164 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
165 +++ b/mcabber/modules/eventcmd/eventcmd.c Thu Jan 17 23:45:05 2013 +0200 |
165 +++ b/mcabber/modules/eventcmd/eventcmd.c Wed Nov 12 22:25:42 2014 +0200 |
166 @@ -0,0 +1,221 @@ |
166 @@ -0,0 +1,221 @@ |
167 + |
167 + |
168 +/* Copyright 2009 Myhailo Danylenko |
168 +/* Copyright 2009 Myhailo Danylenko |
169 + * |
169 + * |
170 + * This file is part of mcabber |
170 + * This file is part of mcabber |