restore i3bar compatibility with libyajl version 1
Patch status: merged
Patch by jj
Long description:
fixes #1004
To apply this patch, use:
curl http://cr.i3wm.org/patch/125/raw.patch | git am
b/i3bar/src/child.c
| 14 |
@@ -359,7 +359,7 @@ void child_sig_cb(struct ev_loop *loop, ev_child *watcher, int revents) {
|
| 15 |
void child_write_output(void) {
|
| 16 |
if (child.click_events) {
|
| 17 |
const unsigned char *output; |
| 18 |
- size_t size; |
| 19 |
+ unsigned int size; |
| 20 |
yajl_gen_get_buf(gen, &output, &size); |
| 21 |
write(child_stdin, output, size); |
| 22 |
write(child_stdin, "\n", 1); |
| 23 |
@@ -388,11 +388,13 @@ void start_child(char *command) {
|
| 24 |
yajl_parser_config parse_conf = { 0, 0 };
|
| 25 |
|
| 26 |
parser = yajl_alloc(&callbacks, &parse_conf, NULL, (void*)&parser_context); |
| 27 |
+ |
| 28 |
+ gen = yajl_gen_alloc(NULL, NULL); |
| 29 |
#else |
| 30 |
parser = yajl_alloc(&callbacks, NULL, &parser_context); |
| 31 |
-#endif |
| 32 |
|
| 33 |
gen = yajl_gen_alloc(NULL); |
| 34 |
+#endif |
| 35 |
|
| 36 |
if (command != NULL) {
|
| 37 |
int pipe_in[2]; /* pipe we read from */ |