pidgin/pidgin

purple_core_get_ui_info now transfers the PurpleUiInfo to the caller, so we need to make sure to not cache it.

2020-04-09, Gary Kramlich
4e766d681de5
Parents 4a61873ffc51
Children 917a228d6268
purple_core_get_ui_info now transfers the PurpleUiInfo to the caller, so we need to make sure to not cache it.
4 files changed, 10 insertions(+), 24 deletions(-)
  • +3 -9
    finch/libfinch.c
  • +2 -2
    libpurple/core.c
  • +1 -1
    libpurple/protocols/jabber/bosh.c
  • +4 -12
    pidgin/libpidgin.c
    • --- a/finch/libfinch.c Wed Apr 01 18:07:49 2020 +0000
    +++ b/finch/libfinch.c Thu Apr 09 21:29:01 2020 -0500
    @@ -56,16 +56,10 @@
    purple_debug_set_ui(PURPLE_DEBUG_UI(ui));
    }
    -static PurpleUiInfo *ui_info = NULL;
    static PurpleUiInfo *
    -finch_ui_get_info(void)
    -{
    - if(!PURPLE_IS_UI_INFO(ui_info)) {
    - ui_info = purple_ui_info_new(_("Finch"), VERSION, "https://pidgin.im",
    - "https://developer.pidgin.im", "console");
    - }
    -
    - return ui_info;
    +finch_ui_get_info(void) {
    + return purple_ui_info_new(_("Finch"), VERSION, "https://pidgin.im",
    + "https://developer.pidgin.im", "console");
    }
    static void
    --- a/libpurple/core.c Wed Apr 01 18:07:49 2020 +0000
    +++ b/libpurple/core.c Thu Apr 09 21:29:01 2020 -0500
    @@ -62,8 +62,8 @@
    purple_core_print_version(void)
    {
    PurpleUiInfo *ui_info = purple_core_get_ui_info();
    - const gchar *ui_name;
    - const gchar *ui_version;
    + const gchar *ui_name = NULL;
    + const gchar *ui_version = NULL;
    gchar *ui_full_name = NULL;
    if(PURPLE_IS_UI_INFO(ui_info)) {
    --- a/libpurple/protocols/jabber/bosh.c Wed Apr 01 18:07:49 2020 +0000
    +++ b/libpurple/protocols/jabber/bosh.c Thu Apr 09 21:29:01 2020 -0500
    @@ -68,7 +68,7 @@
    const gchar *ui_name = NULL;
    const gchar *ui_version = NULL;
    - if(ui_info) {
    + if(PURPLE_IS_UI_INFO(ui_info)) {
    ui_name = purple_ui_info_get_name(ui_info);
    ui_version = purple_ui_info_get_version(ui_info);
    }
    --- a/pidgin/libpidgin.c Wed Apr 01 18:07:49 2020 +0000
    +++ b/pidgin/libpidgin.c Thu Apr 09 21:29:01 2020 -0500
    @@ -248,8 +248,6 @@
    pidgin_notify_init();
    }
    -static PurpleUiInfo *ui_info = NULL;
    -
    static void
    pidgin_quit(void)
    {
    @@ -269,20 +267,14 @@
    purple_debug_set_ui(NULL);
    g_object_unref(ui);
    - g_clear_object(&ui_info);
    -
    /* and end it all... */
    g_application_quit(g_application_get_default());
    }
    -static PurpleUiInfo *pidgin_ui_get_info(void)
    -{
    - if(NULL == ui_info) {
    - ui_info = purple_ui_info_new(PIDGIN_NAME, VERSION, "https://pidgin.im",
    - "https://developer.pidgin.im", "pc");
    - }
    -
    - return ui_info;
    +static PurpleUiInfo *
    +pidgin_ui_get_info(void) {
    + return purple_ui_info_new(PIDGIN_NAME, VERSION, "https://pidgin.im",
    + "https://developer.pidgin.im", "pc");
    }
    static PurpleCoreUiOps core_ops =