bluetooth patches courtesy Dmitriy Korovkin (thanks!):

* When sending data to a device, do service discovery in order to get port number.
* Switched to ussp-push for sending.
* Clear receivers list on rescan.
* Changed the way of window closing in order to shut down IRDA and bluetooth correctly.

1 files changed, 10 insertions, 8 deletions

diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index 9cd9972..dbbb7b3 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -22,4 +22,4 @@ using namespace Opie::Core;
 #include <qlistview.h>
-#include <qtimer.h>
 
+#include <unistd.h>
 /* TRANSLATOR OpieObex::SendWidget */
@@ -85,3 +85,3 @@ bool SendWidget::receiverSelected(int id)
 {
-    return receivers[id]->pixmap(2);
+    return (bool)(receivers[id]->pixmap(2) != NULL);
 }
@@ -189,3 +189,4 @@ void SendWidget::scan_for_receivers()
 {
-    //FIXME: Clean ListBox prior to (re)scan
+    receiverList->clear();
+    receivers.clear();
     sendButton->setDisabled( true );
@@ -228,10 +229,11 @@ void SendWidget::toggle_receiver(QListViewItem* item)
 void SendWidget::closeEvent( QCloseEvent* e) {
-    e->accept(); // make sure
-    QTimer::singleShot(0, this, SLOT(userDone() ) );
-}
-void SendWidget::userDone() {
+    obexSendBase::closeEvent(e);
     QCopEnvelope e0("QPE/IrDaApplet", "disableIrda()");
     QCopEnvelope e1("QPE/Bluetooth", "disableBluetooth()");
-    emit done();
 }
+
+void SendWidget::userDone() {
+    close();
+}
+
 QString SendWidget::file()const {