Skip to content
Snippets Groups Projects
Commit cd2aabec authored by Stepan Salenikovich's avatar Stepan Salenikovich
Browse files

accountmodel: fix Ring contacts not showing up

This fixes the contacts with RingIDs being hidden in the
CategorizedContactModel when setUnreachableHidden is true. This was
due to a regression introduced in an earlier patch which made it
that only the SIP protocol was marked as enabled and only if there
was an IP2IP account.

Change-Id: Ia59c5c6826fdc8cf2513807685204b2b38072ba9
Tuleap: #720
parent 93d17c8d
No related branches found
No related tags found
No related merge requests found
...@@ -450,7 +450,7 @@ void AccountModel::update() ...@@ -450,7 +450,7 @@ void AccountModel::update()
connect(a,SIGNAL(presenceEnabledChanged(bool)),d_ptr,SLOT(slotAccountPresenceEnabledChanged(bool))); connect(a,SIGNAL(presenceEnabledChanged(bool)),d_ptr,SLOT(slotAccountPresenceEnabledChanged(bool)));
emit layoutChanged(); emit layoutChanged();
if (a->isIp2ip()) if (!a->isIp2ip())
d_ptr->enableProtocol(a->protocol()); d_ptr->enableProtocol(a->protocol());
} }
} }
...@@ -473,7 +473,7 @@ void AccountModel::updateAccounts() ...@@ -473,7 +473,7 @@ void AccountModel::updateAccounts()
connect(a,SIGNAL(presenceEnabledChanged(bool)),d_ptr,SLOT(slotAccountPresenceEnabledChanged(bool))); connect(a,SIGNAL(presenceEnabledChanged(bool)),d_ptr,SLOT(slotAccountPresenceEnabledChanged(bool)));
emit dataChanged(index(size()-1,0),index(size()-1,0)); emit dataChanged(index(size()-1,0),index(size()-1,0));
if (a->isIp2ip()) if (!a->isIp2ip())
d_ptr->enableProtocol(a->protocol()); d_ptr->enableProtocol(a->protocol());
emit accountAdded(a); emit accountAdded(a);
...@@ -913,7 +913,7 @@ Account* AccountModel::add(const QString& alias, const Account::Protocol proto) ...@@ -913,7 +913,7 @@ Account* AccountModel::add(const QString& alias, const Account::Protocol proto)
d_ptr->m_pSelectionModel->setCurrentIndex(index(d_ptr->m_lAccounts.size()-1,0), QItemSelectionModel::ClearAndSelect); d_ptr->m_pSelectionModel->setCurrentIndex(index(d_ptr->m_lAccounts.size()-1,0), QItemSelectionModel::ClearAndSelect);
} }
if (a->isIp2ip()) if (!a->isIp2ip())
d_ptr->enableProtocol(proto); d_ptr->enableProtocol(proto);
// Override ringtone path // Override ringtone path
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment