Kaydet (Commit) 14efb92f authored tarafından Will Thompson's avatar Will Thompson Kaydeden (comit) Matúš Kukan

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.
üst e6a38741
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment