diff options
author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-05-02 12:01:16 +0200 |
---|---|---|
committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-05-02 12:01:16 +0200 |
commit | 24ddba4f4dc216824f9700b4eb716eeb7ca60373 (patch) | |
tree | d635e5b8267d3bdd14803c7355b7717c8fb471ef | |
parent | 9f313d12f66c969190baf3d5ff1f0a3f320e7877 (diff) | |
parent | 6214561e45bcc3c6408f9fc70c4c7f648e7f3152 (diff) |
Merge branch 'dus/master' into experimental
-rw-r--r-- | uzbl.c | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -438,18 +438,11 @@ parse_line(char *line) { static void control_fifo(GIOChannel *fd) { gchar *ctl_line; - gsize term_pos; - if(!fd) return; - - g_io_channel_read_line(fd, &ctl_line, NULL, &term_pos, NULL); - ctl_line[term_pos] ='\0'; - + g_io_channel_read_line(fd, &ctl_line, NULL, NULL, NULL); parse_line(ctl_line); - g_free(ctl_line); - return; } |