diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/dtmfform.cpp | 1 | ||||
| -rw-r--r-- | src/line.cpp | 2 | ||||
| -rw-r--r-- | src/mwi/simple_msg_sum_body.cpp | 8 | ||||
| -rw-r--r-- | src/userintf.cpp | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/dtmfform.cpp b/src/gui/dtmfform.cpp index d5d02d9..90e3ed5 100644 --- a/src/gui/dtmfform.cpp +++ b/src/gui/dtmfform.cpp @@ -131,7 +131,6 @@ void DtmfForm::keyPressEvent(QKeyEvent *e) case Qt::Key_E: case Qt::Key_F: threePushButton->animateClick(); - dtmf3(); break; case Qt::Key_4: case Qt::Key_G: diff --git a/src/line.cpp b/src/line.cpp index 1c1de17..a5f1b31 100644 --- a/src/line.cpp +++ b/src/line.cpp @@ -700,7 +700,7 @@ void t_line::reject(void) { stop_timer(LTMR_NO_ANSWER); try { - active_dialog->reject(R_603_DECLINE); + active_dialog->reject(R_486_BUSY_HERE); } catch (t_exception x) { // TODO: there is no call to reject diff --git a/src/mwi/simple_msg_sum_body.cpp b/src/mwi/simple_msg_sum_body.cpp index b42be6a..34aeede 100644 --- a/src/mwi/simple_msg_sum_body.cpp +++ b/src/mwi/simple_msg_sum_body.cpp @@ -54,8 +54,12 @@ bool t_msg_summary::parse(const string &s) { } else if (m.size() == 5) { newmsgs = std::stoul(m.str(1), NULL, 10); oldmsgs = std::stoul(m.str(2), NULL, 10); - newmsgs_urgent = std::stoul(m.str(3), NULL, 10); - oldmsgs_urgent = std::stoul(m.str(4), NULL, 10); + + if (!m.str(3).empty()) + newmsgs_urgent = std::stoul(m.str(3), NULL, 10); + if (!m.str(4).empty()) + oldmsgs_urgent = std::stoul(m.str(4), NULL, 10); + return true; } diff --git a/src/userintf.cpp b/src/userintf.cpp index 1fec547..f75a140 100644 --- a/src/userintf.cpp +++ b/src/userintf.cpp @@ -1565,7 +1565,7 @@ void t_userintf::do_help(const list<t_command_arg> &al) { cout << "Usage:\n"; cout << "\treject\n"; cout << "Description:\n"; - cout << "\tReject an incoming call. A 603 Decline response\n"; + cout << "\tReject an incoming call. A 486 Busy Here response\n"; cout << "\twill be sent.\n"; cout << endl; |