From 29a1d6794e9a4cb6fef234c2435a936a2ec72930 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 14 Sep 2012 13:30:00 +0100 Subject: [PATCH 10/21] mc-tool: use tp_account_manager_dup_valid_accounts tp_account_manager_get_valid_accounts has the confusing (transfer container) transfer-mode, and is deprecated in telepathy-glib 0.19.9. Signed-off-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=55391 --- util/mc-tool.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/util/mc-tool.c b/util/mc-tool.c index 98f56d1..9cf13d5 100644 --- a/util/mc-tool.c +++ b/util/mc-tool.c @@ -515,16 +515,16 @@ compare_accounts (gconstpointer a, } static GList * -get_valid_accounts_sorted (TpAccountManager *manager) +dup_valid_accounts_sorted (TpAccountManager *manager) { - return g_list_sort (tp_account_manager_get_valid_accounts (manager), + return g_list_sort (tp_account_manager_dup_valid_accounts (manager), compare_accounts); } static gboolean command_list (TpAccountManager *manager) { - GList *accounts = get_valid_accounts_sorted (manager); + GList *accounts = dup_valid_accounts_sorted (manager); if (accounts != NULL) { GList *ptr; @@ -535,7 +535,7 @@ command_list (TpAccountManager *manager) puts (tp_account_get_path_suffix (ptr->data)); } - g_list_free (accounts); + g_list_free_full (accounts, g_object_unref); } return FALSE; /* stop mainloop */ @@ -547,7 +547,7 @@ command_summary (TpAccountManager *manager) GList *accounts, *l; guint longest_account = 0; - accounts = tp_account_manager_get_valid_accounts (manager); + accounts = tp_account_manager_dup_valid_accounts (manager); if (accounts == NULL) { return FALSE; } @@ -580,7 +580,7 @@ command_summary (TpAccountManager *manager) status); } - g_list_free (accounts); + g_list_free_full (accounts, g_object_unref); return FALSE; /* stop mainloop */ } @@ -822,7 +822,7 @@ command_dump (TpAccountManager *manager) { GList *accounts, *l; - accounts = tp_account_manager_get_valid_accounts (manager); + accounts = tp_account_manager_dup_valid_accounts (manager); if (accounts == NULL) { return FALSE; } @@ -837,7 +837,7 @@ command_dump (TpAccountManager *manager) printf ("\n------------------------------------------------------------\n\n"); } - g_list_free (accounts); + g_list_free_full (accounts, g_object_unref); return FALSE; /* stop mainloop */ } -- 1.7.10.4