qulogic/pidgin

merge of 'd5e4f520e5e75edd5c104d8ecef82ce67cd1f9d5'
release-2.2.1
2007-10-01, Luke Schierer
ec4063b5fbfe
Parents d5e4f520e5e7312f07aaa977
Children 232ffd43b46c
merge of 'd5e4f520e5e75edd5c104d8ecef82ce67cd1f9d5'
and '312f07aaa9777c8cea463a16389a6b6e5622369d'
2 files changed, 0 insertions(+), 2 deletions(-)
  • +0 -1
    libpurple/ft.c
  • +0 -1
    libpurple/util.c
    • --- a/libpurple/ft.c Mon Oct 01 17:36:33 2007 +0000
    +++ b/libpurple/ft.c Mon Oct 01 17:38:55 2007 +0000
    @@ -67,7 +67,6 @@
    xfer->ui_ops = purple_xfers_get_ui_ops();
    xfer->message = NULL;
    xfer->current_buffer_size = FT_INITIAL_BUFFER_SIZE;
    - xfer->fd = -1;
    ui_ops = purple_xfer_get_ui_ops(xfer);
    --- a/libpurple/util.c Mon Oct 01 17:36:33 2007 +0000
    +++ b/libpurple/util.c Mon Oct 01 17:38:55 2007 +0000
    @@ -3871,7 +3871,6 @@
    gfud->full = full;
    gfud->request = g_strdup(request);
    gfud->include_headers = include_headers;
    - gfud->fd = -1;
    purple_url_parse(url, &gfud->website.address, &gfud->website.port,
    &gfud->website.page, &gfud->website.user, &gfud->website.passwd);