[telepathy-glib/master] ensure_account: fail if account_new returns NULL.

David Laban david.laban at collabora.co.uk
Mon Nov 9 17:04:58 PST 2009


Add assert closer to where the error occurs (tp_account_new returns NULL).
The error will get caught eventually by tp_account_prepare, but it's nice
to fail early.
---
 telepathy-glib/account-manager.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 6f8317b..113ceb2 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -1051,6 +1051,7 @@ tp_account_manager_ensure_account (TpAccountManager *manager,
     return account;
 
   account = tp_account_new (tp_proxy_get_dbus_daemon (manager), path, NULL);
+  g_return_val_if_fail (account != NULL, NULL);
   g_hash_table_insert (priv->accounts, g_strdup (path), account);
 
   tp_account_prepare_async (account, fs, _tp_account_manager_account_ready_cb,
-- 
1.5.6.5




More information about the telepathy-commits mailing list