Mercurial > pidgin3 / changeset

--- a/libpurple/purpleaccountmanager.c	Tue Apr 01 00:28:58 2025 -0500
+++ b/libpurple/purpleaccountmanager.c	Tue Apr 01 00:36:25 2025 -0500
@@ -585,49 +585,15 @@
 	g_object_unref(account);
 }
 
-GList *
+GListModel *
 purple_account_manager_get_enabled(PurpleAccountManager *manager) {
-	GList *enabled = NULL;
-
-	g_return_val_if_fail(PURPLE_IS_ACCOUNT_MANAGER(manager), NULL);
-
-	for(guint index = 0; index < manager->accounts->len; index++) {
-		PurpleAccount *account = g_ptr_array_index(manager->accounts, index);
-
-		if(purple_account_get_enabled(account)) {
-			enabled = g_list_append(enabled, account);
-		}
-	}
-
-	return enabled;
-}
-
-GListModel *
-purple_account_manager_get_enabled_model(PurpleAccountManager *manager) {
 	g_return_val_if_fail(PURPLE_IS_ACCOUNT_MANAGER(manager), NULL);
 
 	return G_LIST_MODEL(manager->enabled);
 }
 
-GList *
+GListModel *
 purple_account_manager_get_disabled(PurpleAccountManager *manager) {
-	GList *disabled = NULL;
-
-	g_return_val_if_fail(PURPLE_IS_ACCOUNT_MANAGER(manager), NULL);
-
-	for(guint index = 0; index < manager->accounts->len; index++) {
-		PurpleAccount *account = g_ptr_array_index(manager->accounts, index);
-
-		if(!purple_account_get_enabled(account)) {
-			disabled = g_list_append(disabled, account);
-		}
-	}
-
-	return disabled;
-}
-
-GListModel *
-purple_account_manager_get_disabled_model(PurpleAccountManager *manager) {
 	g_return_val_if_fail(PURPLE_IS_ACCOUNT_MANAGER(manager), NULL);
 
 	return G_LIST_MODEL(manager->disabled);

--- a/libpurple/purpleaccountmanager.h	Tue Apr 01 00:28:58 2025 -0500
+++ b/libpurple/purpleaccountmanager.h	Tue Apr 01 00:36:25 2025 -0500
@@ -127,26 +127,12 @@
  *
  * Gets the list of all enabled accounts.
  *
- * Returns: (transfer container) (element-type PurpleAccount): The list of all
- *          enabled accounts.
- *
- * Since: 3.0
- */
-PURPLE_DEPRECATED_FOR(purple_account_manager_get_enabled_model)
-GList *purple_account_manager_get_enabled(PurpleAccountManager *manager);
-
-/**
- * purple_account_manager_get_enabled_model:
- * @manager: The account manager instance.
- *
- * Gets the list of all enabled accounts.
- *
  * Returns: (transfer none): The list of all enabled accounts.
  *
  * Since: 3.0
  */
 PURPLE_AVAILABLE_IN_3_0
-GListModel *purple_account_manager_get_enabled_model(PurpleAccountManager *manager);
+GListModel *purple_account_manager_get_enabled(PurpleAccountManager *manager);
 
 /**
  * purple_account_manager_get_disabled:
@@ -154,26 +140,12 @@
  *
  * Gets the list of all disabled accounts.
  *
- * Returns: (transfer container) (element-type PurpleAccount): The list of all
- *          disabled accounts.
- *
- * Since: 3.0
- */
-PURPLE_DEPRECATED_FOR(purple_account_manager_get_disabled_model)
-GList *purple_account_manager_get_disabled(PurpleAccountManager *manager);
-
-/**
- * purple_account_manager_get_disabled_model:
- * @manager: The account manager instance.
- *
- * Gets the list of all disabled accounts.
- *
  * Returns: (transfer none): The list of all disabled accounts.
  *
  * Since: 3.0
  */
 PURPLE_AVAILABLE_IN_3_0
-GListModel *purple_account_manager_get_disabled_model(PurpleAccountManager *manager);
+GListModel *purple_account_manager_get_disabled(PurpleAccountManager *manager);
 
 /**
  * purple_account_manager_get_connected:

--- a/pidgin/pidginaccountsdisabledmenu.c	Tue Apr 01 00:28:58 2025 -0500
+++ b/pidgin/pidginaccountsdisabledmenu.c	Tue Apr 01 00:36:25 2025 -0500
@@ -176,7 +176,7 @@
 pidgin_accounts_disabled_menu_init(PidginAccountsDisabledMenu *menu) {
 	PurpleAccountManager *manager = purple_account_manager_get_default();
 
-	menu->accounts = purple_account_manager_get_disabled_model(manager);
+	menu->accounts = purple_account_manager_get_disabled(manager);
 	g_signal_connect_object(menu->accounts, "items-changed",
 	                        G_CALLBACK(pidgin_accounts_disabled_menu_items_changed_cb),
 	                        menu, G_CONNECT_DEFAULT);

--- a/pidgin/pidginaccountsenabledmenu.c	Tue Apr 01 00:28:58 2025 -0500
+++ b/pidgin/pidginaccountsenabledmenu.c	Tue Apr 01 00:36:25 2025 -0500
@@ -329,7 +329,7 @@
 
 	account_manager = purple_account_manager_get_default();
 
-	menu->accounts = purple_account_manager_get_enabled_model(account_manager);
+	menu->accounts = purple_account_manager_get_enabled(account_manager);
 	g_signal_connect_object(menu->accounts, "items-changed",
 	                        G_CALLBACK(pidgin_accounts_enabled_menu_items_changed_cb),
 	                        menu, G_CONNECT_DEFAULT);

--- a/pidgin/pidginapplication.c	Tue Apr 01 00:28:58 2025 -0500
+++ b/pidgin/pidginapplication.c	Tue Apr 01 00:36:25 2025 -0500
@@ -829,7 +829,7 @@
 	                                       n_actions,
 	                                       online);
 
-	active_accounts = purple_account_manager_get_enabled_model(manager);
+	active_accounts = purple_account_manager_get_enabled(manager);
 	if(g_list_model_get_n_items(active_accounts) == 0) {
 		g_action_group_activate_action(G_ACTION_GROUP(application),
 		                               "manage-accounts", NULL);