Please review!

- change modem default commands because we don't interpret ~ and friends
  (minicom does AFAIK)
- disable unused AT settings for now
- when cancelling dialing, and we didn't yet get a single byte from the modem,
  don't hangup

1 files changed, 21 insertions, 16 deletions

diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp
index 51d4093..d37e406 100644
--- a/noncore/apps/opie-console/dialer.cpp
+++ b/noncore/apps/opie-console/dialer.cpp
@@ -60,2 +60,3 @@ Dialer::Dialer(const Profile& profile, int fd, QWidget *parent, const char *name
         usercancel = 0;
+        cleanshutdown = 0;
 
@@ -135,9 +136,9 @@ void Dialer::trydial(const QString& number)
 {
-        //if(state != state_cancel)
-        //{
-                if(state != state_cancel) switchState(state_preinit);
-                send("+++ATH");
+        if(state != state_cancel) switchState(state_preinit);
+        if(cleanshutdown)
+        {
+                send(m_profile.readEntry("HangupString"));
+                //send("+++ATH");
                 send("");
-                //QString response = receive();
-        //}
+        }
 
@@ -146,4 +147,4 @@ void Dialer::trydial(const QString& number)
                 switchState(state_init);
-                send("ATZ");
-                //send(m_profile.readEntry("InitString"));
+                //send("ATZ");
+                send(m_profile.readEntry("InitString"));
                 QString response2 = receive();
@@ -177,6 +178,6 @@ void Dialer::trydial(const QString& number)
 
-                send(QString("ATDT %1").arg(number));
-                //send(QString("%1 %2").arg(m_profile.readEntry("DialPrefix1")).arg(number));
+                //send(QString("ATDT %1").arg(number));
+                send(QString("%1 %2").arg(m_profile.readEntry("DialPrefix1")).arg(number));
                 QString response5 = receive();
-                if(!response5.contains("\nCONNECT"))
+                if(!response5.contains("\n" + m_profile.readEntry("DefaultConnect")))
                 {
@@ -206,3 +207,3 @@ void Dialer::send(const QString& msg)
 
-qWarning("Sending: '%s'", m.latin1());
+        //qWarning("Sending: '%s'", m.latin1());
 
@@ -237,9 +238,10 @@ QString Dialer::receive()
                         buffer[ret] = 0;
-qWarning("Got: '%s'", buffer);
+                        //qWarning("Got: '%s'", buffer);
                         buf.append(QString(buffer));
                         if(buf.contains("OK") || buf.contains("ERROR") || buf.contains("CONNECT") || (buf.contains("BUSY")))
-{
-qWarning("Receiving: '%s'", buf.latin1());
+                        {
+                                //qWarning("Receiving: '%s'", buf.latin1());
+                                cleanshutdown = 1;
                                 return buf;
-}
+                        }
                 }
@@ -251,4 +253,7 @@ qWarning("Receiving: '%s'", buf.latin1());
                 else if(!(counter++ % 100)) qApp->processEvents();
+
+                if(usercancel) return QString::null;
         }
 
+        cleanshutdown = 1;
         return QString::null;