pidgin/pidgin

Fix some Pidgin account deprecations I missed on my first pass

17 months ago, Gary Kramlich
b03ca9889e90
Parents 454caa755f53
Children aaf28c77ff60
Fix some Pidgin account deprecations I missed on my first pass

Testing Done:
ran `find pidgin/ -type f -name "*.c" touch {} \;` and verified there were no deprecation warnings.

Reviewed at https://reviews.imfreedom.org/r/2134/
3 files changed, 7 insertions(+), 4 deletions(-)
  • +1 -1
    pidgin/pidginaccountchooser.c
  • +5 -2
    pidgin/pidginaccounteditor.c
  • +1 -1
    pidgin/pidginnotificationconnectionerror.c
    • --- a/pidgin/pidginaccountchooser.c Tue Dec 13 01:59:36 2022 -0600
    +++ b/pidgin/pidginaccountchooser.c Tue Dec 13 02:44:43 2022 -0600
    @@ -75,7 +75,7 @@
    return NULL;
    }
    - alias = purple_account_get_private_alias(account);
    + alias = purple_contact_info_get_alias(PURPLE_CONTACT_INFO(account));
    protocol_name = purple_account_get_protocol_name(account);
    username = purple_contact_info_get_username(PURPLE_CONTACT_INFO(account));
    --- a/pidgin/pidginaccounteditor.c Tue Dec 13 01:59:36 2022 -0600
    +++ b/pidgin/pidginaccounteditor.c Tue Dec 13 02:44:43 2022 -0600
    @@ -228,7 +228,9 @@
    /* Determine our values. */
    if(editor->account != NULL) {
    - svalue = purple_account_get_private_alias(editor->account);
    + PurpleContactInfo *info = PURPLE_CONTACT_INFO(editor->account);
    +
    + svalue = purple_contact_info_get_alias(info);
    image = purple_buddy_icons_find_account_icon(editor->account);
    use_global = purple_account_get_bool(editor->account,
    "use-global-buddyicon", TRUE);
    @@ -781,6 +783,7 @@
    static void
    pidgin_account_editor_save_user_options(PidginAccountEditor *editor) {
    + PurpleContactInfo *info = PURPLE_CONTACT_INFO(editor->account);
    const gchar *svalue = NULL;
    gboolean bvalue = FALSE;
    @@ -791,7 +794,7 @@
    if(*svalue == '\0') {
    svalue = NULL;
    }
    - purple_account_set_private_alias(editor->account, svalue);
    + purple_contact_info_set_alias(info, svalue);
    /* Set whether or not to use the global avatar. */
    bvalue = gtk_switch_get_active(GTK_SWITCH(editor->use_custom_avatar));
    --- a/pidgin/pidginnotificationconnectionerror.c Tue Dec 13 01:59:36 2022 -0600
    +++ b/pidgin/pidginnotificationconnectionerror.c Tue Dec 13 02:44:43 2022 -0600
    @@ -88,7 +88,7 @@
    }
    /* Set the target for our actions. */
    - account_id = purple_account_get_id(account);
    + account_id = purple_contact_info_get_id(PURPLE_CONTACT_INFO(account));
    gtk_actionable_set_action_target(GTK_ACTIONABLE(error->reconnect), "s",
    account_id);
    gtk_actionable_set_action_target(GTK_ACTIONABLE(error->reenable), "s",