pidgin/pidgin

Update the account manager to use enabled/disabled for accounts rather than active/inactive.

21 months ago, Gary Kramlich
e587ef39e02e
Parents ce81f2bc04ca
Children e4b5b21470b4
Update the account manager to use enabled/disabled for accounts rather than active/inactive.

Testing Done:
Compiled

Reviewed at https://reviews.imfreedom.org/r/1529/
2 files changed, 53 insertions(+), 8 deletions(-)
  • +21 -8
    libpurple/purpleaccountmanager.c
  • +32 -0
    libpurple/purpleaccountmanager.h
    • --- a/libpurple/purpleaccountmanager.c Thu Jul 21 00:34:31 2022 -0500
    +++ b/libpurple/purpleaccountmanager.c Thu Jul 21 00:36:23 2022 -0500
    @@ -189,8 +189,8 @@
    }
    GList *
    -purple_account_manager_get_active(PurpleAccountManager *manager) {
    - GList *active = NULL, *l = NULL;
    +purple_account_manager_get_enabled(PurpleAccountManager *manager) {
    + GList *enabled = NULL, *l = NULL;
    g_return_val_if_fail(PURPLE_IS_ACCOUNT_MANAGER(manager), NULL);
    @@ -198,16 +198,23 @@
    PurpleAccount *account = PURPLE_ACCOUNT(l->data);
    if(purple_account_get_enabled(account)) {
    - active = g_list_append(active, account);
    + enabled = g_list_append(enabled, account);
    }
    }
    - return active;
    + return enabled;
    }
    GList *
    -purple_account_manager_get_inactive(PurpleAccountManager *manager) {
    - GList *inactive = NULL, *l = NULL;
    +purple_account_manager_get_active(PurpleAccountManager *manager) {
    + g_return_val_if_fail(PURPLE_IS_ACCOUNT_MANAGER(manager), NULL);
    +
    + return purple_account_manager_get_enabled(manager);
    +}
    +
    +GList *
    +purple_account_manager_get_disabled(PurpleAccountManager *manager) {
    + GList *disabled = NULL, *l = NULL;
    g_return_val_if_fail(PURPLE_IS_ACCOUNT_MANAGER(manager), NULL);
    @@ -215,13 +222,19 @@
    PurpleAccount *account = l->data;
    if(!purple_account_get_enabled(account)) {
    - inactive = g_list_append(inactive, account);
    + disabled = g_list_append(disabled, account);
    }
    }
    - return inactive;
    + return disabled;
    }
    +GList *
    +purple_account_manager_get_inactive(PurpleAccountManager *manager) {
    + g_return_val_if_fail(PURPLE_IS_ACCOUNT_MANAGER(manager), NULL);
    +
    + return purple_account_manager_get_disabled(manager);
    +}
    void
    purple_account_manager_reorder(PurpleAccountManager *manager,
    --- a/libpurple/purpleaccountmanager.h Thu Jul 21 00:34:31 2022 -0500
    +++ b/libpurple/purpleaccountmanager.h Thu Jul 21 00:36:23 2022 -0500
    @@ -113,6 +113,19 @@
    GList *purple_account_manager_get_all(PurpleAccountManager *manager);
    /**
    + * purple_account_manager_get_enabled:
    + * @manager: The account manager instance.
    + *
    + * Gets the list of all enabled accounts.
    + *
    + * Returns: (transfer container) (element-type PurpleAccount): The list of all
    + * enabled accounts.
    + *
    + * Since: 3.0.0
    + */
    +GList *purple_account_manager_get_enabled(PurpleAccountManager *manager);
    +
    +/**
    * purple_account_manager_get_active:
    * @manager: The account manager instance.
    *
    @@ -122,10 +135,26 @@
    * active accounts.
    *
    * Since: 3.0.0
    + *
    + * Deprecated: 3.0.0: Use purple_account_manager_get_enabled() instead.
    */
    +G_DEPRECATED_FOR(purple_account_manager_get_enabled)
    GList *purple_account_manager_get_active(PurpleAccountManager *manager);
    /**
    + * purple_account_manager_get_disabled:
    + * @manager: The account manager instance.
    + *
    + * Gets the list of all disabled accounts.
    + *
    + * Returns: (transfer container) (element-type PurpleAccount): The list of all
    + * disabled accounts.
    + *
    + * Since: 3.0.0
    + */
    +GList *purple_account_manager_get_disabled(PurpleAccountManager *manager);
    +
    +/**
    * purple_account_manager_get_inactive:
    * @manager: The account manager instance.
    *
    @@ -135,7 +164,10 @@
    * inactive accounts.
    *
    * Since: 3.0.0
    + *
    + * Deprecated: 3.0.0: Use purple_account_manager_get_disabled() instead.
    */
    +G_DEPRECATED_FOR(purple_account_manager_get_disabled)
    GList *purple_account_manager_get_inactive(PurpleAccountManager *manager);
    /**