OBEX push functionality moved to libbluetooth1.

Made some reformatting in device.cc
In bluezapplet.cpp /etc/init.d/bluetooth is started synchronously if it's called from QCopMessage.

1 files changed, 3 insertions, 5 deletions

diff --git a/noncore/net/opietooth/manager/obexpopup.cpp b/noncore/net/opietooth/manager/obexpopup.cpp
index d1d1b4a..759a452 100644
--- a/noncore/net/opietooth/manager/obexpopup.cpp
+++ b/noncore/net/opietooth/manager/obexpopup.cpp
@@ -15,13 +15,13 @@ using namespace OpieTooth;
 /*
  * c'tor init the QAction
  */
 ObexPopup::ObexPopup(const OpieTooth::Services& service,  OpieTooth::BTDeviceItem* item)
         : QPopupMenu(), m_service(service)
 {
-    owarn << "ObexPopup c'tor" << oendl; 
+    odebug << "ObexPopup c'tor" << oendl; 
 
     m_item = item;
     /* connect action */
     m_push = new QAction( ); // so it's get deleted
     m_push->setText("Push file");
     m_push->addTo( this );
@@ -36,14 +36,12 @@ ObexPopup::~ObexPopup()
 
 
 void ObexPopup::slotPush()
 {
     QString device = m_item->mac();
     int port = m_service.protocolDescriptorList().last().port();
-    device += "@";
-    device += QString::number(port);
-    owarn << "push something to " << device << oendl; 
-    ObexDialog obexDialog(device);
+    odebug << "push something to " << device << " " << port << oendl; 
+    ObexDialog obexDialog(device, port);
     QPEApplication::execDialog( &obexDialog );
 }