pidgin/pidgin

Fix build

2014-05-07, Tomasz Wasilczyk
7939026380e1
Parents 31a8779e91d4
Children 502d8c360580
Fix build
4 files changed, 9 insertions(+), 5 deletions(-)
  • +1 -1
    libpurple/protocols/bonjour/jabber.c
  • +6 -2
    libpurple/protocols/oscar/userinfo.c
  • +1 -1
    libpurple/stun.c
  • +1 -1
    libpurple/util.c
    • --- a/libpurple/protocols/bonjour/jabber.c Wed May 07 11:07:45 2014 +0200
    +++ b/libpurple/protocols/bonjour/jabber.c Wed May 07 11:16:46 2014 +0200
    @@ -1185,7 +1185,7 @@
    /* Send the end of the stream to the other end of the conversation */
    if (bconv->sent_stream_start == FULLY_SENT) {
    size_t len = strlen(STREAM_END);
    - if (send(bconv->socket, STREAM_END, len, 0) != len) {
    + if (send(bconv->socket, STREAM_END, len, 0) != (gssize)len) {
    purple_debug_error("bonjour",
    "bonjour_jabber_close_conversation: "
    "couldn't send data\n");
    --- a/libpurple/protocols/oscar/userinfo.c Wed May 07 11:07:45 2014 +0200
    +++ b/libpurple/protocols/oscar/userinfo.c Wed May 07 11:16:46 2014 +0200
    @@ -369,8 +369,12 @@
    purple_notify_user_info_add_pair_plaintext(user_info, NULL, buf);
    purple_notify_userinfo(od->gc, buddy, user_info, NULL, NULL);
    purple_notify_user_info_destroy(user_info);
    - if (!purple_conv_present_error(buddy, purple_connection_get_account(od->gc), buf))
    - purple_notify_error(od->gc, NULL, buf, NULL);
    + if (!purple_conversation_present_error(buddy,
    + purple_connection_get_account(od->gc), buf))
    + {
    + purple_notify_error(od->gc, NULL, buf, NULL,
    + purple_request_cpar_from_connection(od->gc));
    + }
    g_free(buf);
    }
    --- a/libpurple/stun.c Wed May 07 11:07:45 2014 +0200
    +++ b/libpurple/stun.c Wed May 07 11:16:46 2014 +0200
    @@ -137,7 +137,7 @@
    sc->retry++;
    if (sendto(sc->fd, sc->packet, sc->packetsize, 0,
    (struct sockaddr *)&(sc->addr), sizeof(struct sockaddr_in)) !=
    - sc->packetsize)
    + (gssize)sc->packetsize)
    {
    purple_debug_warning("stun", "sendto failed\n");
    return FALSE;
    --- a/libpurple/util.c Wed May 07 11:07:45 2014 +0200
    +++ b/libpurple/util.c Wed May 07 11:16:46 2014 +0200
    @@ -3106,7 +3106,7 @@
    return FALSE;
    }
    /* Use stat to be absolutely sure. */
    - if ((g_stat(filename_temp, &st) == -1) || (st.st_size != real_size))
    + if ((g_stat(filename_temp, &st) == -1) || (st.st_size != real_size)) {
    purple_debug_error("util", "Error writing data to file %s: "
    "couldn't g_stat file", filename_temp);
    g_free(filename_temp);