| author | zecke <zecke> | 2002-06-15 23:07:12 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-06-15 23:07:12 (UTC) |
| commit | 0675d8e8ea5f599af9f433e1e86b63953b26639d (patch) (side-by-side diff) | |
| tree | fb3aaa512aa8f4600de119574999749758d38139 | |
| parent | 3f49c8a3006c4c51cf7d4a2f84a3926efd3e1820 (diff) | |
| download | opie-0675d8e8ea5f599af9f433e1e86b63953b26639d.zip opie-0675d8e8ea5f599af9f433e1e86b63953b26639d.tar.gz opie-0675d8e8ea5f599af9f433e1e86b63953b26639d.tar.bz2 | |
fix it
| -rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 2 | ||||
| -rw-r--r-- | noncore/net/opietooth/lib/device.cc | 11 | ||||
| -rw-r--r-- | noncore/net/opietooth/lib/lib.pro | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index a380ac7..6e5ee82 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp @@ -78,3 +78,3 @@ namespace OpieTooth { if (c == 1) { - btDevice = new Device("/dev/ttySB0", "scr" ); + btDevice = new Device("/dev/ttySB0", "csr" ); // system("hciattach /dev/ttySB0 csr"); diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc index 5234996..5edfc03 100644 --- a/noncore/net/opietooth/lib/device.cc +++ b/noncore/net/opietooth/lib/device.cc @@ -15,2 +15,3 @@ namespace { for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){ + qWarning("parsePID: %s", (*it).latin1() ); if( !(*it).startsWith("CSR") ){ @@ -80,3 +81,5 @@ void Device::slotExited( OProcess* proc) if(proc== m_process ){ + qWarning("proc == m_process" ); if( m_process->normalExit() ){ // normal exit + qWarning("normalExit" ); int ret = m_process->exitStatus(); @@ -101,2 +104,3 @@ void Device::slotExited( OProcess* proc) }else{ + qWarning("crass" ); m_attached = false; @@ -130,4 +134,6 @@ void Device::slotStdOut(OProcess* proc, char* chars, int len) qWarning("std out" ); - if( len <1 ) + if( len <1 ){ + qWarning( "len < 1 " ); return; + } if(proc == m_process ){ @@ -138,5 +144,6 @@ void Device::slotStdOut(OProcess* proc, char* chars, int len) } -void Device::slotStdErr(OProcess*, char*, int ) +void Device::slotStdErr(OProcess* proc, char* chars, int len) { qWarning("std err" ); + slotStdOut( proc, chars, len ); } diff --git a/noncore/net/opietooth/lib/lib.pro b/noncore/net/opietooth/lib/lib.pro index f2cde06..ce36d66 100644 --- a/noncore/net/opietooth/lib/lib.pro +++ b/noncore/net/opietooth/lib/lib.pro @@ -7,3 +7,3 @@ INCLUDEPATH += $(OPIEDIR)/include DESTDIR = $(QTDIR)/lib$(PROJMAK) -LIBS = -lopie +LIBS += -lopie #VERSION = 0.0.0 |