1 files changed, 14 insertions, 12 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);
 }
@@ -143,3 +143,3 @@ void SendWidget::slotStartIrda() {
     if ( m_irDaIt == m_irDa.end() ) {
-        irdaStatus->setText(tr("complete."));
+        irdaStatus->setText(tr("complete."));
         return;
@@ -175,3 +175,3 @@ void SendWidget::slotStartBt() {
     if (m_btIt == m_bt.end() ) {
-        btStatus->setText(tr("complete."));
+        btStatus->setText(tr("complete."));
         return;
@@ -189,3 +189,4 @@ void SendWidget::scan_for_receivers()
 {
-    //FIXME: Clean ListBox prior to (re)scan
+    receiverList->clear();
+    receivers.clear();
     sendButton->setDisabled( true );
@@ -221,5 +222,5 @@ void SendWidget::toggle_receiver(QListViewItem* item)
     if(item->pixmap(2))
-        item->setPixmap(2,QPixmap());
+        item->setPixmap(2,QPixmap());
     else
-        item->setPixmap(2,Resource::loadPixmap("backup/check.png"));
+        item->setPixmap(2,Resource::loadPixmap("backup/check.png"));
 }
@@ -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 {