qulogic/libgnt

cross-win32: finch doesn't crash anymore

2014-04-22, Tomasz Wasilczyk
27d2daa91e89
Parents ad4a87a62ce7
Children 2bda4d16a629
cross-win32: finch doesn't crash anymore
1 files changed, 17 insertions(+), 3 deletions(-)
  • +17 -3
    gntmain.c
    • --- a/gntmain.c Sun Apr 20 18:13:36 2014 +0200
    +++ b/gntmain.c Tue Apr 22 01:57:05 2014 +0200
    @@ -220,12 +220,17 @@
    static gboolean
    io_invoke_error(GIOChannel *source, GIOCondition cond, gpointer data)
    {
    + /* XXX: it throws an error after evey io_invoke, I have no idea why */
    +#ifndef _WIN32
    int id = GPOINTER_TO_INT(data);
    +
    g_source_remove(id);
    g_io_channel_unref(source);
    channel = NULL;
    setup_io();
    +#endif
    +
    return TRUE;
    }
    @@ -310,7 +315,18 @@
    setup_io()
    {
    int result;
    +
    +#ifdef _WIN32
    + channel = g_io_channel_win32_new_fd(STDIN_FILENO);
    +#else
    channel = g_io_channel_unix_new(STDIN_FILENO);
    +#endif
    +
    + if (channel == NULL) {
    + gnt_warning("failed creating new channel%s", "");
    + return;
    + }
    +
    g_io_channel_set_close_on_unref(channel, TRUE);
    #if 0
    @@ -327,9 +343,7 @@
    (G_IO_NVAL),
    io_invoke_error, GINT_TO_POINTER(result), NULL);
    - g_io_channel_unref(channel); /* Apparently this caused crashes for some people.
    - But irssi does this, so I am going to assume the
    - crashes were caused by some other stuff. */
    + g_io_channel_unref(channel);
    gnt_warning("setting up IO (%d)", channel_read_callback);
    }