added stuff for dun connections

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
@@ -1,7 +1,7 @@
 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
 INCLUDEPATH += $(OPIEDIR)/include .
 DESTDIR		= $(OPIEDIR)/lib$(PROJMAK)
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
@@ -5,5 +5,5 @@ Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
 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
@@ -37,6 +37,7 @@ StartConnection::ConnectionType StartPanConnection::type() {
 
 void StartPanConnection::start()  {
     m_panConnect = new OProcess();
+    qDebug( "IM START " + m_mac );
     *m_panConnect << "pand" << "--connect" << m_mac;
 
     connect( m_panConnect, SIGNAL( processExited( OProcess* ) ) ,
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
@@ -8,7 +8,7 @@ HEADERS         = btconnectionitem.h btdeviceitem.h \
 		  hciconfwrapper.h bticonloader.h \
 		  pppdialog.h obexdialog.h \
 		  devicehandler.h rfcpopup.h obexpopup.h \
-		  rfcommhelper.h panpopup.h
+		  rfcommhelper.h panpopup.h dunpopup.h
 		  
 SOURCES         = btconnectionitem.cpp btdeviceitem.cpp \ 
 	          btserviceitem.cpp stdpopups.cpp \
@@ -18,7 +18,7 @@ SOURCES         = btconnectionitem.cpp btdeviceitem.cpp \
 		  bticonloader.cpp pppdialog.cpp \
 		  obexdialog.cpp devicehandler.cpp \
 		  rfcpopup.cpp obexpopup.cpp \
-		  rfcommhelper.cpp panpopup.cpp 
+		  rfcommhelper.cpp panpopup.cpp dunpopup.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 INCLUDEPATH     += $(OPIEDIR)/noncore/net/opietooth/lib
 DEPENDPATH      += $(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
@@ -58,6 +58,6 @@ void PanPopup::slotConnectAndConfig() {
 
     // more intelligence here later like passing the device ( bnepX )
     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
@@ -28,6 +28,7 @@ QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item )
 
 void PopupHelper::init() {
     insert( 4355, newRfcComPopup );
+    insert( 4354, newDunPopup );
     insert( 4353, newRfcComPopup );
     insert( 4357, newObexPushPopup );
     insert( 4358, newObexPushPopup );
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
@@ -2,6 +2,7 @@
 #include "rfcpopup.h"
 #include "obexpopup.h"
 #include "panpopup.h"
+#include "dunpopup.h"
 
 #include "stdpopups.h"
 
@@ -17,5 +18,9 @@ extern "C" {
     QPopupMenu* newPanPopup( const OpieTooth::Services& service,  OpieTooth::BTDeviceItem* item ) {
         return new OpieTooth::PanPopup( item );
     }
+
+    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
@@ -14,6 +14,7 @@ extern "C" {
     QPopupMenu* newRfcComPopup( const OpieTooth::Services&,  OpieTooth::BTDeviceItem* );
     QPopupMenu* newObexPushPopup( const OpieTooth::Services&,  OpieTooth::BTDeviceItem* );
     QPopupMenu* newPanPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* );
+    QPopupMenu* newDunPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* );
 }
 
 #endif