aboutsummaryrefslogtreecommitdiffstats
path: root/ubuntu-online-accounts
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-09-11 18:35:26 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-09-11 21:10:43 +0800
commit6a5b51b273fc447c7611675b97268fc99216d430 (patch)
tree1c3b87bd9aea1d122dbb829c6c3bcec831fed9c6 /ubuntu-online-accounts
parent57b261b8329e12d1ffcc46e7ecfbeca2caa8fb4b (diff)
downloadgsoc2013-empathy-6a5b51b273fc447c7611675b97268fc99216d430.tar
gsoc2013-empathy-6a5b51b273fc447c7611675b97268fc99216d430.tar.gz
gsoc2013-empathy-6a5b51b273fc447c7611675b97268fc99216d430.tar.bz2
gsoc2013-empathy-6a5b51b273fc447c7611675b97268fc99216d430.tar.lz
gsoc2013-empathy-6a5b51b273fc447c7611675b97268fc99216d430.tar.xz
gsoc2013-empathy-6a5b51b273fc447c7611675b97268fc99216d430.tar.zst
gsoc2013-empathy-6a5b51b273fc447c7611675b97268fc99216d430.zip
use tp_account_manager_dup_valid_accounts()
tp_account_manager_get_valid_accounts() has been deprecated. Fix an accounts list leak in empathy-sanity-cleaning.
Diffstat (limited to 'ubuntu-online-accounts')
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c4
-rw-r--r--ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
index f76eb5cd4..34729960c 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
@@ -310,7 +310,7 @@ manager_prepared_cb (GObject *source,
goto out;
}
- accounts = tp_account_manager_get_valid_accounts (manager);
+ accounts = tp_account_manager_dup_valid_accounts (manager);
while (accounts != NULL)
{
TpAccount *account = accounts->data;
@@ -328,7 +328,7 @@ manager_prepared_cb (GObject *source,
accounts = g_list_delete_link (accounts, accounts);
}
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
out:
tp_weak_ref_destroy (wr);
diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
index d07982a3b..768f0965d 100644
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
@@ -195,7 +195,7 @@ manager_prepared_cb (GObject *source,
goto out;
}
- accounts = tp_account_manager_get_valid_accounts (manager);
+ accounts = tp_account_manager_dup_valid_accounts (manager);
while (accounts != NULL)
{
TpAccount *account = accounts->data;
@@ -219,7 +219,7 @@ manager_prepared_cb (GObject *source,
accounts = g_list_delete_link (accounts, accounts);
}
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
out:
tp_weak_ref_destroy (wr);