Группа :: Графические оболочки/KDE
Пакет: kdenetwork
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: kppp-3.3.2-redial-on-nodialtone.patch
--- kdenetwork-3.3.2/kppp/connect.cpp~ 2005-01-14 11:57:02 +0300
+++ kdenetwork-3.3.2/kppp/connect.cpp 2005-01-14 12:11:16 +0300
@@ -451,6 +451,7 @@ void ConnectWidget::timerEvent(QTimerEve
return;
}
+#if 0
if(readbuffer.contains(gpppdata.modemNoDialtoneResp())) {
timeout_timer->stop();
@@ -460,14 +461,20 @@ void ConnectWidget::timerEvent(QTimerEve
gpppdata.setWaitCallback(false);
return;
}
+#endif
- if(readbuffer.contains(gpppdata.modemNoCarrierResp())) {
+ if(readbuffer.contains(gpppdata.modemNoCarrierResp())
+ || readbuffer.contains(gpppdata.modemNoDialtoneResp())) {
if (gpppdata.get_redial_on_nocarrier()) {
timeout_timer->stop();
timeout_timer->start(gpppdata.modemTimeout()*1000);
if(gpppdata.busyWait() > 0) {
- QString bm = i18n("No carrier. Waiting: %1 seconds").arg(gpppdata.busyWait());
+ QString bm;
+ if(readbuffer.contains(gpppdata.modemNoDialtoneResp()))
+ bm = i18n("No dialtone. Waiting: %1 seconds").arg(gpppdata.busyWait());
+ else
+ bm = i18n("No carrier. Waiting: %1 seconds").arg(gpppdata.busyWait());
messg->setText(bm);
emit debugMessage(bm);
@@ -484,7 +491,10 @@ void ConnectWidget::timerEvent(QTimerEve
} else {
timeout_timer->stop();
- messg->setText(i18n("No Carrier"));
+ if(readbuffer.contains(gpppdata.modemNoDialtoneResp()))
+ messg->setText(i18n("No Dial Tone"));
+ else
+ messg->setText(i18n("No Carrier"));
vmain = 20;
Modem::modem->unlockdevice();
gpppdata.setWaitCallback(false);