author | harlekin <harlekin> | 2003-03-26 22:21:28 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-03-26 22:21:28 (UTC) |
commit | c6e22820a2c28eb8a8f6bab690a36c3fa2605387 (patch) (side-by-side diff) | |
tree | c459c32801c65bb635a4dd331d43cf9a1c9b232c /noncore | |
parent | 0e3f3b3edcbfb26239230e00fa5dc9244bdbbf02 (diff) | |
download | opie-c6e22820a2c28eb8a8f6bab690a36c3fa2605387.zip opie-c6e22820a2c28eb8a8f6bab690a36c3fa2605387.tar.gz opie-c6e22820a2c28eb8a8f6bab690a36c3fa2605387.tar.bz2 |
added stuff for dun connections
-rw-r--r-- | noncore/net/opietooth/lib/lib.pro | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/libopietooth1.control | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/startpanconnection.cpp | 1 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/manager.pro | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/panpopup.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/popuphelper.cpp | 1 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/stdpopups.cpp | 5 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/stdpopups.h | 1 |
8 files changed, 14 insertions, 6 deletions
diff --git a/noncore/net/opietooth/lib/lib.pro b/noncore/net/opietooth/lib/lib.pro index d081b5c..25b3c2d 100644 --- a/noncore/net/opietooth/lib/lib.pro +++ b/noncore/net/opietooth/lib/lib.pro @@ -2,4 +2,4 @@ TEMPLATE = lib CONFIG += qte warn_on release -HEADERS = connection.h parser.h device.h manager.h remotedevice.h services.h startpanconnection.h -SOURCES = connection.cpp parser.cc device.cc manager.cc remotedevice.cc services.cc startpanconnection.cpp +HEADERS = connection.h parser.h device.h manager.h remotedevice.h services.h startpanconnection.h startdunconnection.h +SOURCES = connection.cpp parser.cc device.cc manager.cc remotedevice.cc services.cc startpanconnection.cpp startdunconnection.cpp TARGET = opietooth diff --git a/noncore/net/opietooth/lib/libopietooth1.control b/noncore/net/opietooth/lib/libopietooth1.control index 4534f02..22af489 100644 --- a/noncore/net/opietooth/lib/libopietooth1.control +++ b/noncore/net/opietooth/lib/libopietooth1.control @@ -7,3 +7,3 @@ Version: $QPE_VERSION-$SUB_VERSION Replaces: libopietooth -Depends: libqt2-emb (>=2.3.4), libopie, task-bluez +Depends: libqt2-emb (>=2.3.4), libopie, task-bluez, bluez-rfcomm Description: Opie bluetooth library diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp index b68f02d..e7deede 100644 --- a/noncore/net/opietooth/lib/startpanconnection.cpp +++ b/noncore/net/opietooth/lib/startpanconnection.cpp @@ -39,2 +39,3 @@ void StartPanConnection::start() { m_panConnect = new OProcess(); + qDebug( "IM START " + m_mac ); *m_panConnect << "pand" << "--connect" << m_mac; diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro index f813e65..6fad6ae 100644 --- a/noncore/net/opietooth/manager/manager.pro +++ b/noncore/net/opietooth/manager/manager.pro @@ -10,3 +10,3 @@ HEADERS = btconnectionitem.h btdeviceitem.h \ devicehandler.h rfcpopup.h obexpopup.h \ - rfcommhelper.h panpopup.h + rfcommhelper.h panpopup.h dunpopup.h @@ -20,3 +20,3 @@ SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ rfcpopup.cpp obexpopup.cpp \ - rfcommhelper.cpp panpopup.cpp + rfcommhelper.cpp panpopup.cpp dunpopup.cpp INCLUDEPATH += $(OPIEDIR)/include diff --git a/noncore/net/opietooth/manager/panpopup.cpp b/noncore/net/opietooth/manager/panpopup.cpp index 7a0ee55..695f349 100644 --- a/noncore/net/opietooth/manager/panpopup.cpp +++ b/noncore/net/opietooth/manager/panpopup.cpp @@ -60,3 +60,3 @@ void PanPopup::slotConnectAndConfig() { QCopEnvelope e( "QPE/System", "execute(QString)" ); - e << QString( "networksetup" ); + e << QString( "networksettings" ); diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp index 7da7002..ab22fea 100644 --- a/noncore/net/opietooth/manager/popuphelper.cpp +++ b/noncore/net/opietooth/manager/popuphelper.cpp @@ -30,2 +30,3 @@ void PopupHelper::init() { insert( 4355, newRfcComPopup ); + insert( 4354, newDunPopup ); insert( 4353, newRfcComPopup ); diff --git a/noncore/net/opietooth/manager/stdpopups.cpp b/noncore/net/opietooth/manager/stdpopups.cpp index 934e58b..38b8ee7 100644 --- a/noncore/net/opietooth/manager/stdpopups.cpp +++ b/noncore/net/opietooth/manager/stdpopups.cpp @@ -4,2 +4,3 @@ #include "panpopup.h" +#include "dunpopup.h" @@ -19,2 +20,6 @@ extern "C" { } + + QPopupMenu* newDunPopup( const OpieTooth::Services& service, OpieTooth::BTDeviceItem* item ) { + return new OpieTooth::DunPopup( item ); + } } diff --git a/noncore/net/opietooth/manager/stdpopups.h b/noncore/net/opietooth/manager/stdpopups.h index 7f2f6b3..f52dc3a 100644 --- a/noncore/net/opietooth/manager/stdpopups.h +++ b/noncore/net/opietooth/manager/stdpopups.h @@ -16,2 +16,3 @@ extern "C" { QPopupMenu* newPanPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ); + QPopupMenu* newDunPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ); } |