diff --git a/src/gui/official/PhoneLineButton.cpp b/src/gui/official/PhoneLineButton.cpp index c47a9a865f2d1482824f37d51d290116435fc661..6bc35aff727639eda0877789d120c9b63ded7d1f 100644 --- a/src/gui/official/PhoneLineButton.cpp +++ b/src/gui/official/PhoneLineButton.cpp @@ -23,7 +23,6 @@ PhoneLineButton::PhoneLineButton(const QPixmap &released, void PhoneLineButton::suspend() { - _debug("Swapping started.\n"); if(isPressed()) { mFace = 1; } @@ -45,7 +44,6 @@ PhoneLineButton::swap() void PhoneLineButton::press() { - _debug("Pressed"); mTimer->stop(); JPushButton::press(); } diff --git a/src/gui/official/PhoneLineManagerImpl.cpp b/src/gui/official/PhoneLineManagerImpl.cpp index 49480081a8565baba20af5e0bf23a5d111239a97..f1dee1cb49e86c63e7c13cd5a53b57d2fd8120d6 100644 --- a/src/gui/official/PhoneLineManagerImpl.cpp +++ b/src/gui/official/PhoneLineManagerImpl.cpp @@ -125,7 +125,7 @@ PhoneLineManagerImpl::selectLine(unsigned int line) PhoneLineLocker guard(selectedLine); selectedLine->select(); if(selectedLine->isAvailable()) { - mSession.sendTone(); + mSession.playTone(); } } } diff --git a/src/gui/official/SFLPhoneApp.cpp b/src/gui/official/SFLPhoneApp.cpp index 84b00ca234f64dbaeea434adaf67b40e54f3dcef..abba2a69cb1bdcd07bd5c0b2430ea24fbbce7766 100644 --- a/src/gui/official/SFLPhoneApp.cpp +++ b/src/gui/official/SFLPhoneApp.cpp @@ -14,9 +14,10 @@ SFLPhoneApp::SFLPhoneApp(int argc, char **argv) , mAccount(mSession.getDefaultAccount()) { PhoneLineManager::instance().setNbLines(NB_PHONELINES); - Requester::instance().registerObject< Request >(std::string("sendtone")); + Requester::instance().registerObject< Request >(std::string("playtone")); Requester::instance().registerObject< Request >(std::string("playdtmf")); Requester::instance().registerObject< CallRelatedRequest >(std::string("senddtmf")); + Requester::instance().registerObject< CallRelatedRequest >(std::string("playdtmf")); Requester::instance().registerObject< CallRelatedRequest >(std::string("call")); Requester::instance().registerObject< CallRelatedRequest >(std::string("hold")); Requester::instance().registerObject< CallRelatedRequest >(std::string("unhold")); diff --git a/src/gui/official/Session.cpp b/src/gui/official/Session.cpp index ddf12ce7b77f45b554fa4e1ac0c44479871d266b..6151027f096db4f3144222bd6d92deb012e26f9f 100644 --- a/src/gui/official/Session.cpp +++ b/src/gui/official/Session.cpp @@ -44,9 +44,9 @@ Session::id() const } std::string -Session::sendTone() const +Session::playTone() const { - return Requester::instance().send(mId, "sendtone", std::list< std::string >()); + return Requester::instance().send(mId, "playtone", std::list< std::string >()); } std::string diff --git a/src/gui/official/Session.hpp b/src/gui/official/Session.hpp index bc2a808df73d92301a2b3e8745e0bd6d785ee644..2c18a16e7e2627a028e552e6140906bb19d5e4bc 100644 --- a/src/gui/official/Session.hpp +++ b/src/gui/official/Session.hpp @@ -48,7 +48,7 @@ class Session Call createCall() const; std::string id() const; - std::string sendTone() const; + std::string playTone() const; private: std::string mId;