From 14efb92f907215f72cf841da98996bc9d39fc9e7 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Fri, 23 Mar 2012 08:57:52 +0000 Subject: tubes: remove "account without account??" warning It's completely kosher for Telepathy accounts not to have a parameter called 'account' (which really means 'username'): Salut (link-local XMPP) accounts do not, for example, because you don't need to specify a username. tp_account_get_normalized_name() gets your contact ID for an account, which is really what we're looking for here. --- tubes/source/manager.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tubes') diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index b479d5dc82d2..cb9e5d7a72b0 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -668,9 +668,7 @@ TpAccount* TeleManager::getAccount( const rtl::OString& rAccountID ) for (GList* pA = pAccounts; pA; pA = pA->next) { TpAccount* pAcc = TP_ACCOUNT( pA->data); - const GHashTable* pPar = tp_account_get_parameters( pAcc); - const gchar* pID = tp_asv_get_string( pPar, "account"); - SAL_WARN_IF( !pID, "tubes", "TeleManager::getMyAccount: account without account??"); + const gchar* pID = tp_account_get_normalized_name( pAcc); if (pID && rAccountID == pID) { pAccount = pAcc; -- cgit