pidgin/pidgin

silc: Fix purple_core_get_ui_info usage

2021-02-18, Arkadiy Illarionov
a72067fee822
Parents 507a61f2194a
Children 3c037af432c4
silc: Fix purple_core_get_ui_info usage

Move common code to `silcpurple_get_quit_message`.
Also fix compilation warnings.

Testing Done:
Compile.

Bugs closed: PIDGIN-17436

Reviewed at https://reviews.imfreedom.org/r/517/
2 files changed, 37 insertions(+), 38 deletions(-)
  • +35 -36
    libpurple/protocols/silc/silc.c
  • +2 -2
    libpurple/protocols/silc/wb.c
    • --- a/libpurple/protocols/silc/silc.c Sun Feb 14 20:21:16 2021 -0600
    +++ b/libpurple/protocols/silc/silc.c Thu Feb 18 07:55:09 2021 -0600
    @@ -693,35 +693,47 @@
    return 0;
    }
    +static gchar *
    +silcpurple_get_quit_message(void)
    +{
    + PurpleUiInfo *ui_info;
    + const char *ui_name = NULL, *ui_website = NULL;
    + char *quit_msg;
    +
    + ui_info = purple_core_get_ui_info();
    + if (PURPLE_IS_UI_INFO(ui_info)) {
    + ui_name = purple_ui_info_get_name(ui_info);
    + ui_website = purple_ui_info_get_website(ui_info);
    + }
    +
    + if (!ui_name || !ui_website) {
    + ui_name = "Pidgin";
    + ui_website = PURPLE_WEBSITE;
    + }
    +
    + quit_msg = g_strdup_printf(_("Download %s: %s"), ui_name, ui_website);
    +
    + if (PURPLE_IS_UI_INFO(ui_info)) {
    + g_object_unref(G_OBJECT(ui_info));
    + }
    +
    + return quit_msg;
    +}
    +
    static void
    silcpurple_close(PurpleConnection *gc)
    {
    SilcPurple sg = purple_connection_get_protocol_data(gc);
    SilcPurpleTask task;
    - GHashTable *ui_info;
    - const char *ui_name = NULL, *ui_website = NULL;
    char *quit_msg;
    g_return_if_fail(sg != NULL);
    - ui_info = purple_core_get_ui_info();
    -
    - if(ui_info) {
    - ui_name = g_hash_table_lookup(ui_info, "name");
    - ui_website = g_hash_table_lookup(ui_info, "website");
    - }
    -
    - if(!ui_name || !ui_website) {
    - ui_name = "Pidgin";
    - ui_website = PURPLE_WEBSITE;
    - }
    - quit_msg = g_strdup_printf(_("Download %s: %s"),
    - ui_name, ui_website);
    + quit_msg = silcpurple_get_quit_message();
    /* Send QUIT */
    silc_client_command_call(sg->client, sg->conn, NULL,
    - "QUIT", quit_msg,
    - NULL);
    + "QUIT", quit_msg, NULL);
    g_free(quit_msg);
    if (sg->conn)
    @@ -1888,8 +1900,6 @@
    {
    PurpleConnection *gc;
    SilcPurple sg;
    - GHashTable *ui_info;
    - const char *ui_name = NULL, *ui_website = NULL;
    char *quit_msg;
    gc = purple_conversation_get_connection(conv);
    @@ -1902,22 +1912,14 @@
    if (sg == NULL)
    return PURPLE_CMD_RET_FAILED;
    - ui_info = purple_core_get_ui_info();
    -
    - if(ui_info) {
    - ui_name = g_hash_table_lookup(ui_info, "name");
    - ui_website = g_hash_table_lookup(ui_info, "website");
    + if (args && args[0]) {
    + quit_msg = g_strdup(args[0]);
    + } else {
    + quit_msg = silcpurple_get_quit_message();
    }
    - if(!ui_name || !ui_website) {
    - ui_name = "Pidgin";
    - ui_website = PURPLE_WEBSITE;
    - }
    - quit_msg = g_strdup_printf(_("Download %s: %s"),
    - ui_name, ui_website);
    -
    silc_client_command_call(sg->client, sg->conn, NULL,
    - "QUIT", (args && args[0]) ? args[0] : quit_msg, NULL);
    + "QUIT", quit_msg, NULL);
    g_free(quit_msg);
    return PURPLE_CMD_RET_OK;
    @@ -2137,10 +2139,7 @@
    silcpurple_wb_clear,
    /* padding */
    - NULL,
    - NULL,
    - NULL,
    - NULL
    + { NULL, NULL, NULL, NULL }
    };
    static void
    --- a/libpurple/protocols/silc/wb.c Sun Feb 14 20:21:16 2021 -0600
    +++ b/libpurple/protocols/silc/wb.c Thu Feb 18 07:55:09 2021 -0600
    @@ -437,7 +437,7 @@
    void silcpurple_wb_get_dimensions(const PurpleWhiteboard *wb, int *width, int *height)
    {
    - SilcPurpleWb wbs = purple_whiteboard_get_protocol_data(wb);
    + SilcPurpleWb wbs = purple_whiteboard_get_protocol_data((PurpleWhiteboard *)wb);
    *width = wbs->width;
    *height = wbs->height;
    }
    @@ -456,7 +456,7 @@
    void silcpurple_wb_get_brush(const PurpleWhiteboard *wb, int *size, int *color)
    {
    - SilcPurpleWb wbs = purple_whiteboard_get_protocol_data(wb);
    + SilcPurpleWb wbs = purple_whiteboard_get_protocol_data((PurpleWhiteboard *)wb);
    *size = wbs->brush_size;
    *color = wbs->brush_color;
    }