|
1 # HG changeset patch |
|
2 # Parent d4d77c56d8da7c9771579efe469440eb25947271 |
1 Convert extcmd into a module |
3 Convert extcmd into a module |
2 |
4 |
3 diff -r 17f90f8dc463 mcabber/configure.ac |
5 diff -r d4d77c56d8da mcabber/configure.ac |
4 --- a/mcabber/configure.ac Wed Nov 12 22:24:18 2014 +0200 |
6 --- a/mcabber/configure.ac Sat Nov 07 17:28:17 2015 +0200 |
5 +++ b/mcabber/configure.ac Wed Nov 12 22:25:42 2014 +0200 |
7 +++ b/mcabber/configure.ac Sat Nov 07 17:38:46 2015 +0200 |
6 @@ -295,6 +295,7 @@ |
8 @@ -295,6 +295,7 @@ |
7 modules/beep/Makefile |
9 modules/beep/Makefile |
8 modules/xttitle/Makefile |
10 modules/xttitle/Makefile |
9 modules/fifo/Makefile |
11 modules/fifo/Makefile |
10 + modules/eventcmd/Makefile |
12 + modules/eventcmd/Makefile |
11 modules/urlregex/Makefile |
13 modules/urlregex/Makefile |
12 doc/Makefile |
14 doc/Makefile |
13 doc/guide/Makefile |
15 doc/guide/Makefile |
14 diff -r 17f90f8dc463 mcabber/mcabber/Makefile.am |
16 diff -r d4d77c56d8da mcabber/mcabber/Makefile.am |
15 --- a/mcabber/mcabber/Makefile.am Wed Nov 12 22:24:18 2014 +0200 |
17 --- a/mcabber/mcabber/Makefile.am Sat Nov 07 17:28:17 2015 +0200 |
16 +++ b/mcabber/mcabber/Makefile.am Wed Nov 12 22:25:42 2014 +0200 |
18 +++ b/mcabber/mcabber/Makefile.am Sat Nov 07 17:38:46 2015 +0200 |
17 @@ -7,8 +7,7 @@ |
19 @@ -7,8 +7,7 @@ |
18 xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \ |
20 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 \ |
21 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 \ |
22 xmpp_muc.c xmpp_muc.h xmpp_s10n.c xmpp_s10n.h \ |
21 - caps.c caps.h help.c help.h carbons.c carbons.h \ |
23 - caps.c caps.h help.c help.h carbons.c carbons.h \ |
31 -mcabber_SOURCES += fifo_internal.c fifo.h |
33 -mcabber_SOURCES += fifo_internal.c fifo.h |
32 +mcabber_SOURCES += fifo_internal.c fifo.h extcmd.c extcmd.h |
34 +mcabber_SOURCES += fifo_internal.c fifo.h extcmd.c extcmd.h |
33 endif |
35 endif |
34 |
36 |
35 #SUBDIRS = |
37 #SUBDIRS = |
36 diff -r 17f90f8dc463 mcabber/mcabber/hooks.c |
38 diff -r d4d77c56d8da mcabber/mcabber/hooks.c |
37 --- a/mcabber/mcabber/hooks.c Wed Nov 12 22:24:18 2014 +0200 |
39 --- a/mcabber/mcabber/hooks.c Sat Nov 07 17:28:17 2015 +0200 |
38 +++ b/mcabber/mcabber/hooks.c Wed Nov 12 22:25:42 2014 +0200 |
40 +++ b/mcabber/mcabber/hooks.c Sat Nov 07 17:38:46 2015 +0200 |
39 @@ -36,7 +36,10 @@ |
41 @@ -36,7 +36,10 @@ |
40 #include "utf8.h" |
42 #include "utf8.h" |
41 #include "commands.h" |
43 #include "commands.h" |
42 #include "main.h" |
44 #include "main.h" |
43 -#include "extcmd.h" |
45 -#include "extcmd.h" |
56 int active_window = FALSE; |
58 int active_window = FALSE; |
57 +#endif |
59 +#endif |
58 int message_flags = 0; |
60 int message_flags = 0; |
59 guint rtype = ROSTER_TYPE_USER; |
61 guint rtype = ROSTER_TYPE_USER; |
60 char *wmsg = NULL, *bmsg = NULL, *mmsg = NULL; |
62 char *wmsg = NULL, *bmsg = NULL, *mmsg = NULL; |
61 @@ -399,6 +404,7 @@ |
63 @@ -402,6 +407,7 @@ |
62 } |
64 } |
63 #endif |
65 #endif |
64 |
66 |
65 +#ifndef MODULES_ENABLE |
67 +#ifndef MODULES_ENABLE |
66 if (settings_opt_get_int("events_ignore_active_window") && |
68 if (settings_opt_get_int("events_ignore_active_window") && |
67 current_buddy && scr_get_chatmode()) { |
69 current_buddy && scr_get_chatmode()) { |
68 gpointer bud = BUDDATA(current_buddy); |
70 gpointer bud = BUDDATA(current_buddy); |
69 @@ -417,6 +423,7 @@ |
71 @@ -420,6 +426,7 @@ |
70 hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE, |
72 hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE, |
71 is_groupchat ? EXT_CMD_INFO_GROUPCHAT : EXT_CMD_INFO_RECEIVED, |
73 is_groupchat ? EXT_CMD_INFO_GROUPCHAT : EXT_CMD_INFO_RECEIVED, |
72 wmsg); |
74 wmsg); |
73 +#endif |
75 +#endif |
74 |
76 |
75 // Beep, if enabled: |
77 // Beep, if enabled: |
76 // - if it's a private message |
78 // - if it's a private message |
77 @@ -493,8 +500,10 @@ |
79 @@ -500,8 +507,10 @@ |
78 } |
80 } |
79 #endif |
81 #endif |
80 |
82 |
81 +#ifndef MODULES_ENABLE |
83 +#ifndef MODULES_ENABLE |
82 // External command |
84 // External command |
83 hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE, EXT_CMD_INFO_SENT, NULL); |
85 hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE, EXT_CMD_INFO_SENT, NULL); |
84 +#endif |
86 +#endif |
85 |
87 |
86 g_free(bmsg); |
88 g_free(bmsg); |
87 g_free(mmsg); |
89 g_free(mmsg); |
88 @@ -580,9 +589,11 @@ |
90 @@ -587,9 +596,11 @@ |
89 } |
91 } |
90 #endif |
92 #endif |
91 |
93 |
92 +#ifndef MODULES_ENABLE |
94 +#ifndef MODULES_ENABLE |
93 // External command |
95 // External command |
95 hk_ext_cmd(bjid, EXT_CMD_TYPE_STATUS, newstatus, status_msg); |
97 hk_ext_cmd(bjid, EXT_CMD_TYPE_STATUS, newstatus, status_msg); |
96 +#endif |
98 +#endif |
97 } |
99 } |
98 |
100 |
99 void hk_mystatuschange(time_t timestamp, enum imstatus old_status, |
101 void hk_mystatuschange(time_t timestamp, enum imstatus old_status, |
100 @@ -704,11 +715,13 @@ |
102 @@ -711,11 +722,13 @@ |
101 prev_muc_unread = muc_unread; |
103 prev_muc_unread = muc_unread; |
102 prev_muc_attention = muc_attention; |
104 prev_muc_attention = muc_attention; |
103 |
105 |
104 +#ifndef MODULES_ENABLE |
106 +#ifndef MODULES_ENABLE |
105 /* Call external command */ |
107 /* Call external command */ |
109 g_free(str_unread); |
111 g_free(str_unread); |
110 +#endif |
112 +#endif |
111 } |
113 } |
112 |
114 |
113 // hk_presence_subscription_request(jid, message) |
115 // hk_presence_subscription_request(jid, message) |
114 diff -r 17f90f8dc463 mcabber/mcabber/main.c |
116 diff -r d4d77c56d8da mcabber/mcabber/main.c |
115 --- a/mcabber/mcabber/main.c Wed Nov 12 22:24:18 2014 +0200 |
117 --- a/mcabber/mcabber/main.c Sat Nov 07 17:28:17 2015 +0200 |
116 +++ b/mcabber/mcabber/main.c Wed Nov 12 22:25:42 2014 +0200 |
118 +++ b/mcabber/mcabber/main.c Sat Nov 07 17:38:46 2015 +0200 |
117 @@ -49,9 +49,9 @@ |
119 @@ -50,9 +50,9 @@ |
118 #include "help.h" |
120 #include "help.h" |
119 #include "events.h" |
121 #include "events.h" |
120 #include "compl.h" |
122 #include "compl.h" |
121 -#include "extcmd.h" |
123 -#include "extcmd.h" |
122 |
124 |
123 #ifndef MODULES_ENABLE |
125 #ifndef MODULES_ENABLE |
124 +# include "extcmd.h" |
126 +# include "extcmd.h" |
125 # include "fifo.h" |
127 # include "fifo.h" |
126 #endif |
128 #endif |
127 |
129 |
128 @@ -436,9 +436,11 @@ |
130 @@ -509,9 +509,11 @@ |
129 } |
131 } |
130 #endif |
132 #endif |
131 |
133 |
132 +#ifndef MODULES_ENABLE |
134 +#ifndef MODULES_ENABLE |
133 optstring = settings_opt_get("events_command"); |
135 optstring = settings_opt_get("events_command"); |
135 hk_ext_cmd_init(optstring); |
137 hk_ext_cmd_init(optstring); |
136 +#endif |
138 +#endif |
137 |
139 |
138 optstring = settings_opt_get("roster_display_filter"); |
140 optstring = settings_opt_get("roster_display_filter"); |
139 if (optstring) |
141 if (optstring) |
140 diff -r 17f90f8dc463 mcabber/modules/Makefile.am |
142 diff -r d4d77c56d8da mcabber/modules/Makefile.am |
141 --- a/mcabber/modules/Makefile.am Wed Nov 12 22:24:18 2014 +0200 |
143 --- a/mcabber/modules/Makefile.am Sat Nov 07 17:28:17 2015 +0200 |
142 +++ b/mcabber/modules/Makefile.am Wed Nov 12 22:25:42 2014 +0200 |
144 +++ b/mcabber/modules/Makefile.am Sat Nov 07 17:38:46 2015 +0200 |
143 @@ -1,1 +1,1 @@ |
145 @@ -1,1 +1,1 @@ |
144 -SUBDIRS = beep xttitle fifo urlregex |
146 -SUBDIRS = beep xttitle fifo urlregex |
145 +SUBDIRS = beep xttitle fifo eventcmd urlregex |
147 +SUBDIRS = beep xttitle fifo eventcmd urlregex |
146 diff -r 17f90f8dc463 mcabber/modules/eventcmd/Makefile.am |
148 diff -r d4d77c56d8da mcabber/modules/eventcmd/Makefile.am |
147 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
149 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
148 +++ b/mcabber/modules/eventcmd/Makefile.am Wed Nov 12 22:25:42 2014 +0200 |
150 +++ b/mcabber/modules/eventcmd/Makefile.am Sat Nov 07 17:38:46 2015 +0200 |
149 @@ -0,0 +1,13 @@ |
151 @@ -0,0 +1,13 @@ |
150 + |
152 + |
151 +if INSTALL_HEADERS |
153 +if INSTALL_HEADERS |
152 +pkglib_LTLIBRARIES = libeventcmd.la |
154 +pkglib_LTLIBRARIES = libeventcmd.la |
153 +libeventcmd_la_SOURCES = eventcmd.c $(top_srcdir)/mcabber/extcmd.c $(top_srcdir)/mcabber/extcmd.h |
155 +libeventcmd_la_SOURCES = eventcmd.c ../mcabber/extcmd.c ../mcabber/extcmd.h |
154 +libeventcmd_la_LDFLAGS = -module -avoid-version -shared |
156 +libeventcmd_la_LDFLAGS = -module -avoid-version -shared |
155 + |
157 + |
156 +LDADD = $(GLIB_LIBS) |
158 +LDADD = $(GLIB_LIBS) |
157 +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \ |
159 +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \ |
158 + $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \ |
160 + $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \ |
159 + $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \ |
161 + $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \ |
160 + $(ENCHANT_CFLAGS) |
162 + $(ENCHANT_CFLAGS) |
161 +endif |
163 +endif |
162 + |
164 + |
163 diff -r 17f90f8dc463 mcabber/modules/eventcmd/eventcmd.c |
165 diff -r d4d77c56d8da mcabber/modules/eventcmd/eventcmd.c |
164 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
166 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
165 +++ b/mcabber/modules/eventcmd/eventcmd.c Wed Nov 12 22:25:42 2014 +0200 |
167 +++ b/mcabber/modules/eventcmd/eventcmd.c Sat Nov 07 17:38:46 2015 +0200 |
166 @@ -0,0 +1,221 @@ |
168 @@ -0,0 +1,221 @@ |
167 + |
169 + |
168 +/* Copyright 2009 Myhailo Danylenko |
170 +/* Copyright 2009 Myhailo Danylenko |
169 + * |
171 + * |
170 + * This file is part of mcabber |
172 + * This file is part of mcabber |