pidgin/pidgin

Clean up serv_chat_send_file() a little
release-2.x.y
2020-05-20, David Woodhouse
3d50e9e9e84d
Parents 2097f91763f1
Children 5f9ec468c680
Clean up serv_chat_send_file() a little

And serv_send_file() too while we're at it.
1 files changed, 15 insertions(+), 14 deletions(-)
  • +15 -14
    libpurple/server.c
    • --- a/libpurple/server.c Wed May 20 14:56:03 2020 +0100
    +++ b/libpurple/server.c Wed May 20 17:35:57 2020 +0100
    @@ -982,14 +982,14 @@
    PurplePlugin *prpl;
    PurplePluginProtocolInfo *prpl_info;
    - if (gc) {
    - prpl = purple_connection_get_prpl(gc);
    - prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
    + g_return_if_fail(gc != NULL);
    - if (prpl_info->send_file &&
    - (!prpl_info->can_receive_file
    - || prpl_info->can_receive_file(gc, who)))
    - prpl_info->send_file(gc, who, file);
    + prpl = purple_connection_get_prpl(gc);
    + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
    +
    + if (prpl_info->send_file && (!prpl_info->can_receive_file
    + || prpl_info->can_receive_file(gc, who))) {
    + prpl_info->send_file(gc, who, file);
    }
    }
    @@ -998,13 +998,14 @@
    PurplePlugin *prpl;
    PurplePluginProtocolInfo *prpl_info;
    - if (gc) {
    - prpl = purple_connection_get_prpl(gc);
    - prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
    + g_return_if_fail(gc != NULL);
    +
    + prpl = purple_connection_get_prpl(gc);
    + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
    - if (prpl_info->chat_send_file &&
    - (!prpl_info->chat_can_receive_file
    - || prpl_info->chat_can_receive_file(gc, id)))
    - prpl_info->chat_send_file(gc, id, file);
    + if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, chat_send_file) &&
    + (!PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, chat_can_receive_file)
    + || prpl_info->chat_can_receive_file(gc, id))) {
    + prpl_info->chat_send_file(gc, id, file);
    }
    }