diff --git a/kde/src/SFLPhoneView.cpp b/kde/src/SFLPhoneView.cpp index 663a94124405ec13ac102e744eca07d65e62b18a..2cd7a4d59cb56ecd260ebbaee2b2f45fb1280baf 100755 --- a/kde/src/SFLPhoneView.cpp +++ b/kde/src/SFLPhoneView.cpp @@ -1040,13 +1040,14 @@ void SFLPhoneView::editBeforeCall() void SFLPhoneView::setAccountFirst(Account * account) { - qDebug() << "setAccountFirst : " << (account ? account->getAlias() : QString()); + qDebug() << "setAccountFirst : " << (account ? account->getAlias() : QString()) << (account ? account->getAccountId() : QString()); if(account) { CallView::setPriorAccountId(account->getAccountId()); } else { CallView::setPriorAccountId(QString()); } + qDebug() << "Current account id" << CallView::getCurrentAccountId(); updateStatusMessage(); } diff --git a/kde/src/conf/dlgaccounts.cpp b/kde/src/conf/dlgaccounts.cpp index 80d0b3773cdb4bbd066efecb99cf3394ae723999..beb2949831d37dbbf50d117e5ffd1b4694224745 100755 --- a/kde/src/conf/dlgaccounts.cpp +++ b/kde/src/conf/dlgaccounts.cpp @@ -164,7 +164,7 @@ void DlgAccounts::saveAccountList() currentId = QString(current->getAccountId()); } } - qDebug() << currentId << " : " << current->isChecked(); + //qDebug() << currentId << " : " << current->isChecked(); } //remove accounts that are in the configurationManager but not in the client for (int i = 0; i < accountIds.size(); i++) { diff --git a/kde/src/lib/CallModel.hpp b/kde/src/lib/CallModel.hpp index 98a8782e15a2ceef4ab47462bb9b4f4b47cd1d31..e4dfffc3591d79490e3cf80d066c3249a9f1c7e1 100644 --- a/kde/src/lib/CallModel.hpp +++ b/kde/src/lib/CallModel.hpp @@ -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 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; addCall(call); selectItem(call);