diff --git a/kde/src/SFLPhoneView.cpp b/kde/src/SFLPhoneView.cpp index 3fe0b964be097d75c2bfe37ec2f89fe5ba29f6c2..c92563eff05b43335677c2f31155e217806dbe3f 100755 --- a/kde/src/SFLPhoneView.cpp +++ b/kde/src/SFLPhoneView.cpp @@ -544,8 +544,7 @@ void SFLPhoneView::updateStatusMessage() else { emit statusMessageChangeAsked(i18n("Using account") + " \'" + account->getAlias() - + "\' (" + account->getAccountDetail(ACCOUNT_TYPE) + ", " - + account->getAccountDetail(ACCOUNT_REGISTRATION_STATUS) + ")"); + + "\' (" + account->getAccountDetail(ACCOUNT_REGISTRATION_STATUS) + ")"); } } diff --git a/kde/src/lib/CallModel.hpp b/kde/src/lib/CallModel.hpp index 6655074669d1ab1e9ab4b4915a00a949f0add7b5..89c8893aa74f316f4d5304c0de28197a960aad91 100644 --- a/kde/src/lib/CallModel.hpp +++ b/kde/src/lib/CallModel.hpp @@ -423,7 +423,8 @@ CALLMODEL_TEMPLATE bool CALLMODEL_T::changeConference(const QString& confId, con ///Remove a conference from the model and the TreeView CALLMODEL_TEMPLATE void CALLMODEL_T::removeConference(const QString &confId) { - qDebug() << "Ending conversation containing " << m_sPrivateCallList_callId[confId]->children.size() << " participants"; + if (m_sPrivateCallList_callId[confId]) + qDebug() << "Ending conversation containing " << m_sPrivateCallList_callId[confId]->children.size() << " participants"; removeConference(getCall(confId)); } diff --git a/kde/src/widgets/CallTreeItem.cpp b/kde/src/widgets/CallTreeItem.cpp index 60726326b039444a10a20b736cd5b2298ffdd439..4076381b5a0d5a50caa150b22dc97a4970bf86ab 100644 --- a/kde/src/widgets/CallTreeItem.cpp +++ b/kde/src/widgets/CallTreeItem.cpp @@ -114,7 +114,7 @@ void CallTreeItem::setCall(Call *call) m_pTransferPrefixL = new QLabel(i18n("Transfer to : ")); m_pTransferNumberL = new QLabel(); m_pElapsedL = new QLabel(); - QSpacerItem* verticalSpacer = new QSpacerItem(16777215, 20, QSizePolicy::Expanding, QSizePolicy::Expanding); + QSpacerItem* verticalSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding); m_pTransferPrefixL->setVisible(false); m_pTransferNumberL->setVisible(false); diff --git a/kde/src/widgets/HistoryTreeItem.cpp b/kde/src/widgets/HistoryTreeItem.cpp index 42df65546d366208e61c97593ba93ba3c5321c32..fbef5138ffed52e4e8dd3bddeab71d99e2106d6b 100644 --- a/kde/src/widgets/HistoryTreeItem.cpp +++ b/kde/src/widgets/HistoryTreeItem.cpp @@ -242,7 +242,9 @@ void HistoryTreeItem::callAgain() if (m_pItemCall) { kDebug() << "Calling "<< m_pItemCall->getPeerPhoneNumber(); } - SFLPhone::model()->addDialingCall(m_Name, SFLPhone::app()->model()->getCurrentAccountId())->setCallNumber(m_PhoneNumber); + Call* call = SFLPhone::model()->addDialingCall(m_Name, SFLPhone::app()->model()->getCurrentAccountId()); + call->setCallNumber(m_PhoneNumber); + call->actionPerformed(CALL_ACTION_ACCEPT); } ///Copy the call