[telepathy-glib/master] One more leaking code-path.

David Laban david.laban at collabora.co.uk
Wed Nov 18 05:09:58 PST 2009


I'll get used to this eventually.
---
 telepathy-glib/account-manager.c |    4 ++--
 telepathy-glib/account.c         |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index eabe0fe..439e3b0 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -1398,8 +1398,6 @@ tp_account_manager_prepare_async (TpAccountManager *manager,
 
   priv = manager->priv;
 
-  feature_array = _tp_quark_array_copy (features);
-
   /* In this object, there are no features which are activatable (core is
    * forced on you). They'd be activated here though. */
 
@@ -1419,6 +1417,8 @@ tp_account_manager_prepare_async (TpAccountManager *manager,
   result = g_simple_async_result_new (G_OBJECT (manager),
       callback, user_data, tp_account_manager_prepare_finish);
 
+  feature_array = _tp_quark_array_copy (features);
+
   error = tp_proxy_get_invalidated (manager);
   if (error != NULL)
     {
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index f7f0d46..d8d77a5 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -2571,8 +2571,6 @@ tp_account_prepare_async (TpAccount *account,
 
   priv = account->priv;
 
-  feature_array = _tp_quark_array_copy (features);
-
   /* In this object, there are no features which are activatable (core is
    * forced on you). They'd be activated here though. */
 
@@ -2591,6 +2589,8 @@ tp_account_prepare_async (TpAccount *account,
   result = g_simple_async_result_new (G_OBJECT (account),
       callback, user_data, tp_account_prepare_finish);
 
+  feature_array = _tp_quark_array_copy (features);
+
   error = tp_proxy_get_invalidated (account);
 
   if (error != NULL)
-- 
1.5.6.5



More information about the telepathy-commits mailing list