Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

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) + ")");
    }
 }
 

kde/src/lib/CallModel.hpp

@@ -423,6 +423,7 @@ 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)
 {
+   if (m_sPrivateCallList_callId[confId])
       qDebug() << "Ending conversation containing " << m_sPrivateCallList_callId[confId]->children.size() << " participants";
    removeConference(getCall(confId));
 }

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);

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