diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-03-23 08:57:52 +0000 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:39:40 +0200 |
| commit | 14efb92f907215f72cf841da98996bc9d39fc9e7 (patch) | |
| tree | a81c2b85083676856fa6299fb9cbb382f5667dde /tubes | |
| parent | e6a3874108e77d366085a4b275ac337cda5225ea (diff) | |
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.
Diffstat (limited to 'tubes')
| -rw-r--r-- | tubes/source/manager.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
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; |