aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-connection-aggregator.c4
-rw-r--r--libempathy/empathy-presence-manager.c4
-rw-r--r--libempathy/empathy-utils.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c
index 2b517bf51..8d05b6c28 100644
--- a/libempathy/empathy-connection-aggregator.c
+++ b/libempathy/empathy-connection-aggregator.c
@@ -188,7 +188,7 @@ am_prepare_cb (GObject *source,
goto out;
}
- accounts = tp_account_manager_get_valid_accounts (self->priv->mgr);
+ accounts = tp_account_manager_dup_valid_accounts (self->priv->mgr);
for (l = accounts; l != NULL; l = g_list_next (l))
{
TpAccount *account = l->data;
@@ -199,7 +199,7 @@ am_prepare_cb (GObject *source,
tp_g_signal_connect_object (self->priv->mgr, "account-validity-changed",
G_CALLBACK (account_validity_changed_cb), self, 0);
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
out:
g_object_unref (self);
diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index 9b1a39217..29af2a107 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -433,13 +433,13 @@ account_manager_ready_cb (GObject *source_object,
most_available_presence_changed (account_manager, state, status,
status_message, self);
- accounts = tp_account_manager_get_valid_accounts (self->priv->manager);
+ accounts = tp_account_manager_dup_valid_accounts (self->priv->manager);
for (l = accounts; l != NULL; l = l->next)
{
tp_g_signal_connect_object (l->data, "status-changed",
G_CALLBACK (account_status_changed_cb), self, 0);
}
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
g_free (status);
g_free (status_message);
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index cc518c0b0..eb1e27f4c 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -567,7 +567,7 @@ empathy_account_manager_get_accounts_connected (gboolean *connecting)
TP_ACCOUNT_MANAGER_FEATURE_CORE)))
g_critical (G_STRLOC ": %s called before AccountManager ready", G_STRFUNC);
- accounts = tp_account_manager_get_valid_accounts (manager);
+ accounts = tp_account_manager_dup_valid_accounts (manager);
for (l = accounts; l != NULL; l = l->next)
{
@@ -583,7 +583,7 @@ empathy_account_manager_get_accounts_connected (gboolean *connecting)
break;
}
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
g_object_unref (manager);
if (connecting != NULL)