pidgin/pidgin

Merged in default (pull request #681)

2020-04-10, Gary Kramlich
a7e2c454e817
Parents c38a56bd55363123ce0bafa7
Children 54a18c68d6d0
Merged in default (pull request #681)

Fix some issues that scanbuild had identified

Approved-by: Elliott Sales de Andrade
Approved-by: John Bailey
3 files changed, 3 insertions(+), 8 deletions(-)
  • +3 -3
    libpurple/xfer.c
  • +0 -3
    pidgin/gtkconv.c
  • +0 -2
    pidgin/gtkutils.c
    • --- a/libpurple/xfer.c Thu Apr 09 08:47:36 2020 +0000
    +++ b/libpurple/xfer.c Fri Apr 10 02:34:01 2020 +0000
    @@ -1429,10 +1429,10 @@
    */
    purple_xfer_increase_buffer_size(xfer);
    } else {
    - gboolean result;
    + gboolean handler_result = FALSE;
    g_signal_emit(xfer, signals[SIG_DATA_NOT_SENT], 0, buffer + r,
    - result - r, &result);
    - if (!result) {
    + result - r, &handler_result);
    + if (!handler_result) {
    purple_xfer_cancel_local(xfer);
    }
    }
    --- a/pidgin/gtkconv.c Thu Apr 09 08:47:36 2020 +0000
    +++ b/pidgin/gtkconv.c Fri Apr 10 02:34:01 2020 +0000
    @@ -3485,13 +3485,10 @@
    {
    PurpleBuddy *buddy = (PurpleBuddy *)node;
    PurpleAccount *account;
    - PurpleIMConversation *im;
    if (!PURPLE_IS_BUDDY(node))
    continue;
    - im = purple_conversations_find_im_with_account(purple_buddy_get_name(buddy), purple_buddy_get_account(buddy));
    -
    account = purple_buddy_get_account(buddy);
    /* TODO WEBKIT: (I'm not actually sure if this is webkit-related --Mark Doliner) */
    if (purple_account_is_connected(account) /*|| account == purple_conversation_get_account(gtkconv->active_conv)*/)
    --- a/pidgin/gtkutils.c Thu Apr 09 08:47:36 2020 +0000
    +++ b/pidgin/gtkutils.c Fri Apr 10 02:34:01 2020 +0000
    @@ -977,8 +977,6 @@
    purple_serv_send_file(purple_account_get_connection(data->account), data->who, data->filename);
    break;
    case DND_IM_IMAGE:
    - conv = PURPLE_CONVERSATION(purple_im_conversation_new(data->account, data->who));
    -
    if (!g_file_get_contents(data->filename, &filedata, &size,
    &err)) {
    char *str;