Diffstat (limited to 'noncore/apps/opie-console/dialer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/dialer.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp index ce2b688..8524422 100644 --- a/noncore/apps/opie-console/dialer.cpp +++ b/noncore/apps/opie-console/dialer.cpp | |||
@@ -86,22 +86,25 @@ Dialer::~Dialer() | |||
86 | } | 86 | } |
87 | 87 | ||
88 | void Dialer::setHangupOnly() | 88 | void Dialer::setHangupOnly() |
89 | { | 89 | { |
90 | state = state_cancel; | 90 | state = state_cancel; |
91 | usercancel = 1; | 91 | usercancel = 1; |
92 | send("+++ATH\r"); | ||
92 | } | 93 | } |
93 | 94 | ||
94 | void Dialer::slotCancel() | 95 | void Dialer::slotCancel() |
95 | { | 96 | { |
96 | if(state != state_online) | 97 | if(state != state_online) |
97 | { | 98 | { |
98 | usercancel = 1; | 99 | usercancel = 1; |
99 | reset(); | 100 | reset(); |
100 | } | 101 | } |
101 | else accept(); | 102 | else { |
103 | accept(); | ||
104 | } | ||
102 | } | 105 | } |
103 | 106 | ||
104 | void Dialer::reset() | 107 | void Dialer::reset() |
105 | { | 108 | { |
106 | qWarning("reset"); | 109 | qWarning("reset"); |
107 | switchState(state_cancel); | 110 | switchState(state_cancel); |
@@ -137,15 +140,15 @@ void Dialer::trydial(const QString& number) | |||
137 | { | 140 | { |
138 | qWarning("TryDial:%s", number.latin1() ); | 141 | qWarning("TryDial:%s", number.latin1() ); |
139 | if(state != state_cancel) switchState(state_preinit); | 142 | if(state != state_cancel) switchState(state_preinit); |
140 | if(cleanshutdown) | 143 | if(cleanshutdown) |
141 | { | 144 | { |
142 | qWarning("HangupString " + m_profile.readEntry("HangupString")); | 145 | qWarning("HangupString " + m_profile.readEntry("HangupString")); |
143 | send(m_profile.readEntry("HangupString")); | 146 | //send(m_profile.readEntry("HangupString")); |
144 | //send("+++ATH"); | 147 | send("+++ATH\r"); |
145 | send(""); | 148 | //send(""); |
146 | } | 149 | } |
147 | 150 | ||
148 | if(state != state_cancel) | 151 | if(state != state_cancel) |
149 | { | 152 | { |
150 | switchState(state_init); | 153 | switchState(state_init); |
151 | //send("ATZ"); | 154 | //send("ATZ"); |
@@ -184,13 +187,13 @@ void Dialer::trydial(const QString& number) | |||
184 | qWarning("progress"); | 187 | qWarning("progress"); |
185 | switchState(state_dialing); | 188 | switchState(state_dialing); |
186 | 189 | ||
187 | send(QString("ATDT %1\r").arg(number)); | 190 | send(QString("ATDT %1\r").arg(number)); |
188 | // send(QString("%1 %2").arg(m_profile.readEntry("DialPrefix1")).arg(number)); | 191 | // send(QString("%1 %2").arg(m_profile.readEntry("DialPrefix1")).arg(number)); |
189 | QString response5 = receive(); | 192 | QString response5 = receive(); |
190 | if(!response5.contains("\n" + m_profile.readEntry("DefaultConnect"))) | 193 | if(!response5.contains("CONNECT") ) |
191 | { | 194 | { |
192 | if(response5.contains("BUSY")) | 195 | if(response5.contains("BUSY")) |
193 | switchState(state_dialing); | 196 | switchState(state_dialing); |
194 | else | 197 | else |
195 | { | 198 | { |
196 | QMessageBox::warning(this, | 199 | QMessageBox::warning(this, |
@@ -198,15 +201,17 @@ void Dialer::trydial(const QString& number) | |||
198 | QObject::tr("Dialing the number failed.")); | 201 | QObject::tr("Dialing the number failed.")); |
199 | slotCancel(); | 202 | slotCancel(); |
200 | } | 203 | } |
201 | } | 204 | } |
202 | } | 205 | } |
203 | 206 | ||
207 | |||
204 | if(state != state_cancel) | 208 | if(state != state_cancel) |
205 | { | 209 | { |
206 | switchState(state_online); | 210 | state = state_online; |
211 | slotCancel(); | ||
207 | } | 212 | } |
208 | } | 213 | } |
209 | 214 | ||
210 | void Dialer::send(const QString& msg) | 215 | void Dialer::send(const QString& msg) |
211 | { | 216 | { |
212 | QString m = msg; | 217 | QString m = msg; |
@@ -243,20 +248,23 @@ QString Dialer::receive() | |||
243 | 248 | ||
244 | if(ret > 0) | 249 | if(ret > 0) |
245 | { | 250 | { |
246 | for(int i = 0; i < ret; i++) | 251 | for(int i = 0; i < ret; i++) |
247 | buffer[i] = buffer[i] & 0x7F; | 252 | buffer[i] = buffer[i] & 0x7F; |
248 | buffer[ret] = 0; | 253 | buffer[ret] = 0; |
249 | //qWarning("Got: '%s'", buffer); | 254 | qWarning("Got: %s", buffer); |
250 | buf.append(QString(buffer)); | 255 | buf.append(QString(buffer)); |
251 | if(buf.contains("OK") || buf.contains("ERROR") || buf.contains("CONNECT") || (buf.contains("BUSY"))) | 256 | if(buf.contains("OK") || buf.contains("ERROR") || buf.contains("CONNECT") || (buf.contains("BUSY"))) |
252 | { | 257 | { |
253 | //qWarning("Receiving: '%s'", buf.latin1()); | 258 | //qWarning("Receiving: '%s'", buf.latin1()); |
254 | cleanshutdown = 1; | 259 | cleanshutdown = 1; |
255 | return buf; | 260 | return buf; |
256 | } | 261 | }else if (buf.contains("NO CARRIER") || buf.contains("NO DIALTONE") ) { |
262 | cleanshutdown = 1; | ||
263 | return QString::null; | ||
264 | } | ||
257 | } | 265 | } |
258 | else if(ret < 0) | 266 | else if(ret < 0) |
259 | { | 267 | { |
260 | if(errno != EAGAIN) reset(); | 268 | if(errno != EAGAIN) reset(); |
261 | else if(!(counter++ % 100)) qApp->processEvents(); | 269 | else if(!(counter++ % 100)) qApp->processEvents(); |
262 | } | 270 | } |