qulogic/pidgin

merge of '0f5cf0aaeb07300ee4f118bca066df8a6736a789'
release-2.2.1
2007-10-01, Luke Schierer
466855db01f9
Parents 0f5cf0aaeb07536822f0bc01
Children 34b818f1b8b8
merge of '0f5cf0aaeb07300ee4f118bca066df8a6736a789'
and '536822f0bc014a13db391400482c7d16d8a15796'
2 files changed, 7 insertions(+), 3 deletions(-)
  • +6 -2
    libpurple/protocols/yahoo/yahoo_filexfer.c
  • +1 -1
    libpurple/upnp.c
    • --- a/libpurple/protocols/yahoo/yahoo_filexfer.c Mon Oct 01 17:48:33 2007 +0000
    +++ b/libpurple/protocols/yahoo/yahoo_filexfer.c Mon Oct 01 17:48:48 2007 +0000
    @@ -281,9 +281,13 @@
    }
    }
    } else {
    - xfer->fd = -1;
    + /* TODO: Using xfer->fd like this is probably a bad thing... */
    if (purple_proxy_connect(NULL, account, xfer_data->host, xfer_data->port,
    - yahoo_receivefile_connected, xfer) == NULL) {
    + yahoo_receivefile_connected, xfer) == NULL)
    + xfer->fd = -1;
    + else
    + xfer->fd = 0;
    + if (xfer->fd == -1) {
    purple_notify_error(gc, NULL, _("File Transfer Failed"),
    _("Unable to establish file descriptor."));
    purple_xfer_cancel_remote(xfer);
    --- a/libpurple/upnp.c Mon Oct 01 17:48:33 2007 +0000
    +++ b/libpurple/upnp.c Mon Oct 01 17:48:48 2007 +0000
    @@ -553,7 +553,7 @@
    dd->inpa = 0;
    close(dd->fd);
    - dd->fd = -1;
    + dd->fd = 0;
    /* parse the response, and see if it was a success */
    purple_upnp_parse_discover_response(buf, len, dd);