-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 7 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/btconnectionitem.cpp | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 1281116..59ade6d 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc @@ -258,18 +258,19 @@ void Manager::searchConnections() { emit connections( list ); delete proc; } } -void Manager::slotConnectionExited( OProcess* /*proc*/ ) { - qWarning("exited"); +void Manager::slotConnectionExited( OProcess* proc ) { + qWarning("<<<<<<<<<<<<<<<<<exited"); ConnectionState::ValueList list; list = parseConnections( m_hcitoolCon ); emit connections(list ); + delete proc; } void Manager::slotConnectionOutput(OProcess* proc, char* cha, int len) { QCString str(cha, len ); m_hcitoolCon.append( str ); - delete proc; + //delete proc; } ConnectionState::ValueList Manager::parseConnections( const QString& out ) { ConnectionState::ValueList list2; QStringList list = QStringList::split('\n', out ); diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index d3abb54..5c5f069 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -417,9 +417,9 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s * Add the existing connections (pairs) to the connections tab. * This one triggers the search */ void BlueBase::addConnectedDevices() { - m_localDevice->searchConnections(); + m_localDevice->searchConnections(); } /** diff --git a/noncore/net/opietooth/manager/btconnectionitem.cpp b/noncore/net/opietooth/manager/btconnectionitem.cpp index 6fb9c11..b57d1b3 100644 --- a/noncore/net/opietooth/manager/btconnectionitem.cpp +++ b/noncore/net/opietooth/manager/btconnectionitem.cpp @@ -6,8 +6,9 @@ using namespace OpieTooth; BTConnectionItem::BTConnectionItem( QListView* parent, const ConnectionState& con ) : BTListItem( parent ){ m_con = con; setText(0, m_con.mac() ); + setText(1, m_con.connectionMode() ); } BTConnectionItem::~BTConnectionItem() { } |