gaim/gaim

<datallah> siege: i think that should be #ifdef _WIN32'd (and reported to glib/gtk)
oldstatus
2005-07-07, Christopher O'Brien
134d1a2b6b6d
Parents 133b03216c0c
Children a309df11db1c
siege: i think that should be #ifdef _WIN32'd (and reported to glib/gtk)
fair enough
1 files changed, 10 insertions(+), 14 deletions(-)
  • +10 -14
    src/gtkeventloop.c
    • --- a/src/gtkeventloop.c Thu Jul 07 11:31:40 2005 -0400
    +++ b/src/gtkeventloop.c Thu Jul 07 11:33:26 2005 -0400
    @@ -58,25 +58,21 @@
    closure->result, g_io_channel_unix_get_fd(source));
    #endif
    - if(gaim_cond) {
    - /* I've noticed some win32 systems are triggering a
    - closure's callback function with a gaim_cond of
    - zero. This seems to happen due to GTK events, like
    - moving/resizing a window. There's no reason that the
    - closure function should ever be passed a condition of
    - zero, so let's drop it instead - siege */
    -
    - closure->function(closure->data, g_io_channel_unix_get_fd(source),
    - gaim_cond);
    -
    - } else {
    -#if 0
    +#ifdef _WIN32
    + if(! gaim_cond) {
    +#if DEBUG
    gaim_debug(GAIM_DEBUG_MISC, "gtk_eventloop",
    "CLOSURE received GIOCondition of 0x%x, which does not"
    " match 0x%x (READ) or 0x%x (WRITE)\n",
    condition, GAIM_GTK_READ_COND, GAIM_GTK_WRITE_COND);
    -#endif
    +#endif /* DEBUG */
    +
    + return TRUE;
    }
    +#endif /* _WIN32 */
    +
    + closure->function(closure->data, g_io_channel_unix_get_fd(source),
    + gaim_cond);
    return TRUE;
    }