summaryrefslogtreecommitdiff
authorjosef <josef>2002-10-21 20:25:16 (UTC)
committer josef <josef>2002-10-21 20:25:16 (UTC)
commit9d48ea3af681dec0644c980dba889a85b9eb19a8 (patch) (side-by-side diff)
tree69868d4452f6461bae4011436b9d25c94985b25b
parentdf721474c6ed785ab7f258f4a9d9384cafa3f8fa (diff)
downloadopie-9d48ea3af681dec0644c980dba889a85b9eb19a8.zip
opie-9d48ea3af681dec0644c980dba889a85b9eb19a8.tar.gz
opie-9d48ea3af681dec0644c980dba889a85b9eb19a8.tar.bz2
- argh! fix for closeRawIO()
even 2-line-patches can be wrong :)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/io_modem.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index e1f9ff1..f246d81 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -1,58 +1,60 @@
#include "io_modem.h"
#include "dialer.h"
IOModem::IOModem( const Profile &profile )
: IOSerial( profile ) {
m_profile = profile;
}
IOModem::~IOModem() {
}
void IOModem::close() {
// Hangup, discarding result
- Dialer d(m_profile, rawIO());
+ int fd = rawIO();
+ Dialer d(m_profile, fd);
d.setHangupOnly();
d.exec();
- closeRawIO();
+ closeRawIO(fd);
IOSerial::close();
}
bool IOModem::open() {
bool ret = IOSerial::open();
if(!ret) return false;
- Dialer d(m_profile, rawIO());
+ int fd = rawIO();
+ Dialer d(m_profile, fd);
int result = d.exec();
- closeRawIO();
+ closeRawIO(fd);
if(result == QDialog::Accepted)
{
return true;
}
else
{
close();
return false;
}
}
void IOModem::reload( const Profile &config ) {
m_device = config.readEntry("Device", MODEM_DEFAULT_DEVICE);
m_baud = config.readNumEntry("Baud", MODEM_DEFAULT_BAUD);
m_parity = config.readNumEntry("Parity", MODEM_DEFAULT_PARITY);
m_dbits = config.readNumEntry("DataBits", MODEM_DEFAULT_DBITS);
m_sbits = config.readNumEntry("StopBits", MODEM_DEFAULT_SBITS);
m_flow = config.readNumEntry("Flow", MODEM_DEFAULT_FLOW);
m_initString = config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING );
m_resetString = config.readEntry("ResetString", MODEM_DEFAULT_RESET_STRING );
m_dialPref1 = config.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 );
m_dialSuf1 = config.readEntry("DialSuffix1", MODEM_DEFAULT_DIAL_SUFFIX1 );