author | mickeyl <mickeyl> | 2003-11-12 17:38:52 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-12 17:38:52 (UTC) |
commit | 2fcfbc6e35c50d55333c01d582ef7e3d4a477e2b (patch) (unidiff) | |
tree | b1113d0934216eeb7ddbb162842f4a4bd61e846a /noncore | |
parent | f4f7df4a3c54081c3b82489aba097e1c36359313 (diff) | |
download | opie-2fcfbc6e35c50d55333c01d582ef7e3d4a477e2b.zip opie-2fcfbc6e35c50d55333c01d582ef7e3d4a477e2b.tar.gz opie-2fcfbc6e35c50d55333c01d582ef7e3d4a477e2b.tar.bz2 |
apply patch from Tim Smith <tim@electronghost.co.uk>
-rw-r--r-- | noncore/net/opietooth/lib/startpanconnection.cpp | 14 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/panpopup.cpp | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp index e7deede..6e0ab7e 100644 --- a/noncore/net/opietooth/lib/startpanconnection.cpp +++ b/noncore/net/opietooth/lib/startpanconnection.cpp | |||
@@ -55,2 +55,3 @@ void StartPanConnection::slotExited( OProcess* proc ) { | |||
55 | delete m_panConnect; | 55 | delete m_panConnect; |
56 | m_panConnect = 0l; | ||
56 | } | 57 | } |
@@ -66,2 +67,15 @@ void StartPanConnection::stop() { | |||
66 | } | 67 | } |
68 | m_panConnect = new OProcess(); | ||
69 | qDebug("IM STOP " + m_mac); | ||
70 | |||
71 | *m_panConnect << "pand" << "--kill" << m_mac; | ||
72 | |||
73 | connect( m_panConnect, SIGNAL( processExited( OProcess* ) ) , | ||
74 | this, SLOT( slotExited( OProcess* ) ) ); | ||
75 | connect( m_panConnect, SIGNAL( receivedStdout( OProcess*, char*, int ) ), | ||
76 | this, SLOT( slotStdOut( OProcess*, char*, int ) ) ); | ||
77 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | ||
78 | qWarning( "could not stop" ); | ||
79 | delete m_panConnect; | ||
80 | } | ||
67 | } | 81 | } |
diff --git a/noncore/net/opietooth/manager/panpopup.cpp b/noncore/net/opietooth/manager/panpopup.cpp index 695f349..8b05964 100644 --- a/noncore/net/opietooth/manager/panpopup.cpp +++ b/noncore/net/opietooth/manager/panpopup.cpp | |||
@@ -51,2 +51,3 @@ void PanPopup::slotConnect() { | |||
51 | void PanPopup::slotDisconnect() { | 51 | void PanPopup::slotDisconnect() { |
52 | if (!m_panconnection) m_panconnection = new StartPanConnection( m_item->mac() ); | ||
52 | m_panconnection->stop(); | 53 | m_panconnection->stop(); |