pidgin/pidgin

merge of '34b818f1b8b8e5ce50a83a03052188ad479bec8e'
release-2.2.1
2007-10-01, Luke Schierer
c024bed8fdd5
Parents 34b818f1b8b8fa4b1205a719
Children 3da1b9dc9a7b
merge of '34b818f1b8b8e5ce50a83a03052188ad479bec8e'
and 'fa4b1205a719e569e710e124ee000c27729c4614'
1 files changed, 1 insertions(+), 13 deletions(-)
  • +1 -13
    libpurple/dnssrv.c
    • --- a/libpurple/dnssrv.c Mon Oct 01 17:48:57 2007 +0000
    +++ b/libpurple/dnssrv.c Mon Oct 01 17:49:01 2007 +0000
    @@ -69,7 +69,6 @@
    char *error_message;
    GSList *results;
    #else
    - int fd_in, fd_out;
    pid_t pid;
    #endif
    };
    @@ -113,11 +112,8 @@
    purple_restore_default_signal_handlers();
    #endif
    - if (read(in, query, 256) <= 0) {
    - close(out);
    - close(in);
    + if (read(in, query, 256) <= 0)
    _exit(0);
    - }
    size = res_query( query, C_IN, T_SRV, (u_char*)&answer, sizeof( answer));
    @@ -183,9 +179,6 @@
    ret = g_list_remove(ret, ret->data);
    }
    - close(out);
    - close(in);
    -
    _exit(0);
    }
    @@ -365,8 +358,6 @@
    query_data->cb = cb;
    query_data->extradata = extradata;
    query_data->pid = pid;
    - query_data->fd_out = out[0];
    - query_data->fd_in = in[1];
    query_data->handle = purple_input_add(out[0], PURPLE_INPUT_READ, resolved, query_data);
    g_free(query);
    @@ -423,9 +414,6 @@
    }
    g_free(query_data->query);
    g_free(query_data->error_message);
    -#else
    - close(query_data->fd_out);
    - close(query_data->fd_in);
    #endif
    g_free(query_data);
    }