Commit 201847af authored by Emmanuel Lepage's avatar Emmanuel Lepage

Alternative can now be selected from the call view context menu

parent ec858ede
...@@ -1040,13 +1040,14 @@ void SFLPhoneView::editBeforeCall() ...@@ -1040,13 +1040,14 @@ void SFLPhoneView::editBeforeCall()
void SFLPhoneView::setAccountFirst(Account * account) void SFLPhoneView::setAccountFirst(Account * account)
{ {
qDebug() << "setAccountFirst : " << (account ? account->getAlias() : QString()); qDebug() << "setAccountFirst : " << (account ? account->getAlias() : QString()) << (account ? account->getAccountId() : QString());
if(account) { if(account) {
CallView::setPriorAccountId(account->getAccountId()); CallView::setPriorAccountId(account->getAccountId());
} }
else { else {
CallView::setPriorAccountId(QString()); CallView::setPriorAccountId(QString());
} }
qDebug() << "Current account id" << CallView::getCurrentAccountId();
updateStatusMessage(); updateStatusMessage();
} }
......
...@@ -164,7 +164,7 @@ void DlgAccounts::saveAccountList() ...@@ -164,7 +164,7 @@ void DlgAccounts::saveAccountList()
currentId = QString(current->getAccountId()); currentId = QString(current->getAccountId());
} }
} }
qDebug() << currentId << " : " << current->isChecked(); //qDebug() << currentId << " : " << current->isChecked();
} }
//remove accounts that are in the configurationManager but not in the client //remove accounts that are in the configurationManager but not in the client
for (int i = 0; i < accountIds.size(); i++) { for (int i = 0; i < accountIds.size(); i++) {
......
...@@ -159,7 +159,12 @@ template<typename CallWidget, typename Index> Call* CallModel<CallWidget,Index>: ...@@ -159,7 +159,12 @@ template<typename CallWidget, typename Index> Call* CallModel<CallWidget,Index>:
///Create a new dialing call from peer name and the account ID ///Create a new dialing call from peer name and the account ID
template<typename CallWidget, typename Index> Call* CallModel<CallWidget,Index>::addDialingCall(const QString & peerName, QString account) template<typename CallWidget, typename Index> Call* CallModel<CallWidget,Index>::addDialingCall(const QString & peerName, QString account)
{ {
Call* call = Call::buildDialingCall(generateCallId(), peerName, account); QString account2 = account;
if (account2.isEmpty()) {
account2 = getCurrentAccountId();
}
Call* call = Call::buildDialingCall(generateCallId(), peerName, account2);
activeCalls[call->getCallId()] = call; activeCalls[call->getCallId()] = call;
addCall(call); addCall(call);
selectItem(call); selectItem(call);
......
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