File tree 3 files changed +3
-11
lines changed
3 files changed +3
-11
lines changed Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ Build requirements
23
23
24
24
xmppconsole has only 1 required dependency:
25
25
26
- * [ libstrophe] ( https://github.com/strophe/libstrophe )
26
+ * [ libstrophe] ( https://github.com/strophe/libstrophe ) version 0.10.0 or higher
27
27
28
28
You will need the following dependencies in order to build optional UI modules.
29
29
Original file line number Diff line number Diff line change @@ -6,12 +6,12 @@ AC_CONFIG_FILES([Makefile])
6
6
AC_PROG_CC
7
7
AM_PROG_CC_C_O
8
8
9
- PKG_CHECK_MODULES([ libstrophe] , [ libstrophe >= 0.9 .0] ,
9
+ PKG_CHECK_MODULES([ libstrophe] , [ libstrophe >= 0.10 .0] ,
10
10
[
11
11
LIBS="$libstrophe_LIBS $LIBS"
12
12
CFLAGS="$CFLAGS $libstrophe_CFLAGS"
13
13
] ,
14
- [ AC_MSG_ERROR ( [ libstrophe is required] ) ] )
14
+ [ AC_MSG_ERROR ( [ libstrophe 0.10.0 or higher is required] ) ] )
15
15
16
16
#
17
17
# Ncurses UI module
Original file line number Diff line number Diff line change 37
37
#include <string.h>
38
38
#include <strophe.h>
39
39
40
- /* #define HAVE_NEW_LIBSTROPHE 1 */
41
-
42
40
#define XC_RECONNECT_TIMER 3000
43
41
44
42
static int xc_reconnect_cb (xmpp_ctx_t * xmpp_ctx , void * userdata );
@@ -66,11 +64,9 @@ static void xc_conn_handler(xmpp_conn_t *conn,
66
64
if (signalled || xc_ui_is_done (ctx -> c_ui ))
67
65
xc_ui_quit (ctx -> c_ui );
68
66
else {
69
- #ifdef HAVE_NEW_LIBSTROPHE
70
67
xmpp_global_timed_handler_add (ctx -> c_ctx ,
71
68
xc_reconnect_cb ,
72
69
XC_RECONNECT_TIMER , ctx );
73
- #endif /* HAVE_NEW_LIBSTROPHE */
74
70
}
75
71
}
76
72
}
@@ -193,12 +189,8 @@ int main(int argc, char **argv)
193
189
xc_ui_ctx_set (& ui , & ctx );
194
190
rc = xc_connect (xmpp_conn , & ctx );
195
191
if (rc != 0 ) {
196
- #ifdef HAVE_NEW_LIBSTROPHE
197
192
xmpp_global_timed_handler_add (xmpp_ctx , xc_reconnect_cb ,
198
193
XC_RECONNECT_TIMER , & ctx );
199
- #else
200
- (void )xc_reconnect_cb ;
201
- #endif /* HAVE_NEW_LIBSTROPHE */
202
194
}
203
195
204
196
g_ctx = & ctx ;
You can’t perform that action at this time.
0 commit comments