From ea5ebde9716fb6a6009251a9271bce6c9735f9e3 Mon Sep 17 00:00:00 2001 From: Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com> Date: Mon, 26 Sep 2011 15:16:54 -0400 Subject: [PATCH] Fix a daemon bug --- daemon/src/managerimpl.cpp | 1 + kde/src/CallView.cpp | 1 + kde/src/lib/CallModel.hpp | 1 + kde/src/lib/Contact.cpp | 2 +- kde/src/widgets/CallTreeItem.cpp | 4 ++-- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp index 29bc657244..d4d2ef1ac9 100644 --- a/daemon/src/managerimpl.cpp +++ b/daemon/src/managerimpl.cpp @@ -1053,6 +1053,7 @@ void ManagerImpl::detachParticipant (const std::string& call_id, removeParticipant (call_id); processRemainingParticipant (current_call_id, conf); } + _dbus.getCallManager()->conferenceChanged (conf->getConfID(), conf->getStateStr()); } else { _debug ("Manager: Unbind main participant from conference %d"); getMainBuffer()->unBindAll (Call::DEFAULT_ID); diff --git a/kde/src/CallView.cpp b/kde/src/CallView.cpp index 10896cf233..c3a6b80368 100644 --- a/kde/src/CallView.cpp +++ b/kde/src/CallView.cpp @@ -520,6 +520,7 @@ void CallView::conferenceCreatedSignal(const QString& confId) void CallView::conferenceChangedSignal(const QString& confId, const QString& state) { + qDebug() << "Conf changed signal"; conferenceChanged(confId, state); } diff --git a/kde/src/lib/CallModel.hpp b/kde/src/lib/CallModel.hpp index a04ec7407a..d81dda3bb4 100644 --- a/kde/src/lib/CallModel.hpp +++ b/kde/src/lib/CallModel.hpp @@ -270,6 +270,7 @@ template<typename CallWidget, typename Index> bool CallModel<CallWidget,Index>:: ///Executed when the daemon signal a modification in an existing conference. Update the call list and update the TreeView template<typename CallWidget, typename Index> bool CallModel<CallWidget,Index>::conferenceChanged(const QString& confId, const QString& state) { + qDebug() << "Conf changed2"; Q_UNUSED(state) if (!privateCallList_callId[confId]) { diff --git a/kde/src/lib/Contact.cpp b/kde/src/lib/Contact.cpp index 4a8f718ffc..d78b93a847 100644 --- a/kde/src/lib/Contact.cpp +++ b/kde/src/lib/Contact.cpp @@ -17,7 +17,7 @@ * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ + **************************************************************************/ #include "Contact.h" #include <QtCore/QDebug> diff --git a/kde/src/widgets/CallTreeItem.cpp b/kde/src/widgets/CallTreeItem.cpp index 9626b0b6a8..71c2d13184 100644 --- a/kde/src/widgets/CallTreeItem.cpp +++ b/kde/src/widgets/CallTreeItem.cpp @@ -16,7 +16,7 @@ * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ + **************************************************************************/ #include <QtCore/QStringList> @@ -34,7 +34,7 @@ const char * CallTreeItem::callStateIcons[12] = {ICON_INCOMING, ICON_RINGING, IC CallTreeItem::CallTreeItem(QWidget *parent) : QWidget(parent), itemCall(0), init(false) { - + setMaximumSize(99999,50); } CallTreeItem::~CallTreeItem() -- GitLab