pidgin/pidgin

Rename purple_account_set_status_list and purple_status_set_active_with_attrs_list

2020-04-08, qarkai
cd2da3a58f6d
Parents 684befe3ae5d
Children c38a56bd5536
Rename purple_account_set_status_list and purple_status_set_active_with_attrs_list
6 files changed, 17 insertions(+), 9 deletions(-)
  • +4 -0
    ChangeLog.API
  • +3 -3
    libpurple/account.c
  • +3 -1
    libpurple/account.h
  • +1 -1
    libpurple/accounts.c
  • +3 -3
    libpurple/status.c
  • +3 -1
    libpurple/status.h
    • --- a/ChangeLog.API Sun Dec 01 15:36:50 2019 +0300
    +++ b/ChangeLog.API Wed Apr 08 21:15:34 2020 +0300
    @@ -176,6 +176,8 @@
    details.
    * purple_account_get_alias renamed to purple_account_get_private_alias
    * purple_account_set_alias renamed to purple_account_set_private_alias
    + * purple_account_set_status_list renamed to
    + purple_account_set_status_attrs
    * purple_account_option_get_type renamed to
    purple_account_option_get_pref_type
    * PurplePrivacyType renamed to PurpleAccountPrivacyType
    @@ -312,6 +314,8 @@
    * PurpleStatus is now a GObject. Please see the documentation for
    details.
    * purple_status_attr_* functions are now purple_status_attribute_*
    + * purple_status_set_active_with_attrs_list renamed to
    + purple_status_set_active_with_attrs_dict
    * PurpleStatusAttr renamed to PurpleStatusAttribute
    * PurplePresence is now an abstract type, and is a GObject. Please see
    the documentation for details.
    --- a/libpurple/account.c Sun Dec 01 15:36:50 2019 +0300
    +++ b/libpurple/account.c Wed Apr 08 21:15:34 2020 +0300
    @@ -1797,13 +1797,13 @@
    va_start(args, active);
    attrs = purple_attrs_from_vargs(args);
    - purple_account_set_status_list(account, status_id, active, attrs);
    + purple_account_set_status_attrs(account, status_id, active, attrs);
    g_hash_table_destroy(attrs);
    va_end(args);
    }
    void
    -purple_account_set_status_list(PurpleAccount *account, const char *status_id,
    +purple_account_set_status_attrs(PurpleAccount *account, const char *status_id,
    gboolean active, GHashTable *attrs)
    {
    PurpleStatus *status;
    @@ -1822,7 +1822,7 @@
    }
    if (active || purple_status_is_independent(status))
    - purple_status_set_active_with_attrs_list(status, active, attrs);
    + purple_status_set_active_with_attrs_dict(status, active, attrs);
    /*
    * Our current statuses are saved to accounts.xml (so that when we
    --- a/libpurple/account.h Sun Dec 01 15:36:50 2019 +0300
    +++ b/libpurple/account.h Wed Apr 08 21:15:34 2020 +0300
    @@ -452,8 +452,10 @@
    * You can only deactivate an exclusive status by activating another exclusive
    * status. So, if @a status_id is an exclusive status and @a active is @c
    * FALSE, this function does nothing.
    + *
    + * Since: 3.0.0
    */
    -void purple_account_set_status_list(PurpleAccount *account,
    +void purple_account_set_status_attrs(PurpleAccount *account,
    const char *status_id, gboolean active, GHashTable *attrs);
    /**
    --- a/libpurple/accounts.c Sun Dec 01 15:36:50 2019 +0300
    +++ b/libpurple/accounts.c Wed Apr 08 21:15:34 2020 +0300
    @@ -275,7 +275,7 @@
    purple_account_get_status(account, type));
    }
    - purple_account_set_status_list(account, type, active, attrs);
    + purple_account_set_status_attrs(account, type, active, attrs);
    g_hash_table_destroy(attrs);
    }
    --- a/libpurple/status.c Sun Dec 01 15:36:50 2019 +0300
    +++ b/libpurple/status.c Wed Apr 08 21:15:34 2020 +0300
    @@ -702,7 +702,7 @@
    void
    purple_status_set_active(PurpleStatus *status, gboolean active)
    {
    - purple_status_set_active_with_attrs_list(status, active, NULL);
    + purple_status_set_active_with_attrs_dict(status, active, NULL);
    }
    /*
    @@ -716,12 +716,12 @@
    {
    GHashTable *attrs = purple_attrs_from_vargs(args);
    - purple_status_set_active_with_attrs_list(status, active, attrs);
    + purple_status_set_active_with_attrs_dict(status, active, attrs);
    g_hash_table_destroy(attrs);
    }
    void
    -purple_status_set_active_with_attrs_list(PurpleStatus *status, gboolean active,
    +purple_status_set_active_with_attrs_dict(PurpleStatus *status, gboolean active,
    GHashTable *attrs)
    {
    PurpleStatusPrivate *priv = NULL;
    --- a/libpurple/status.h Sun Dec 01 15:36:50 2019 +0300
    +++ b/libpurple/status.h Wed Apr 08 21:15:34 2020 +0300
    @@ -502,8 +502,10 @@
    * Sets whether or not a status is active.
    *
    * This should only be called by the account, conversation, and buddy APIs.
    + *
    + * Since: 3.0.0
    */
    -void purple_status_set_active_with_attrs_list(PurpleStatus *status, gboolean active,
    +void purple_status_set_active_with_attrs_dict(PurpleStatus *status, gboolean active,
    GHashTable *attrs);
    /**