2 files changed, 26 insertions, 16 deletions

diff --git a/core/obex/btobex.cpp b/core/obex/btobex.cpp
index b8556da..886f3dc 100644
--- a/core/obex/btobex.cpp
+++ b/core/obex/btobex.cpp
@@ -1,86 +1,85 @@
 
 #include "btobex.h"
 #include <opietooth/manager.h>
 #include <opietooth/services.h>
 
 /* OPIE */
 #include <opie2/oprocess.h>
 #include <opie2/odebug.h>
 
 /* QT */
 #include <qfileinfo.h>
 #include <qstring.h>
 #include <qmap.h>
 #include <qmessagebox.h>
 
 using namespace  OpieObex;
 
 using namespace Opie::Core;
 /* TRANSLATOR OpieObex::Obex */
 using namespace OpieTooth;
 
 BtObex::BtObex( QObject *parent, const char* name )
   : QObject(parent, name )
 {
     m_rec = 0;
     m_send=0;
     m_count = 0;
     m_receive = false;
     connect( this, SIGNAL(error(int) ), // for recovering to receive
              SLOT(slotError() ) );
     connect( this, SIGNAL(sent(bool) ),
              SLOT(slotError() ) );
     btManager = NULL;
 };
 
 BtObex::~BtObex() {
-    if (btManager)
-        delete btManager;
+    delete btManager;
     delete m_rec;
     delete m_send;
 }
 
 void BtObex::receive()  {
     m_receive = true;
     m_outp = QString::null;
     m_rec = new OProcess();
 
     // TODO mbhaynie: No idea if this actually works -- maybe opd is better.
     *m_rec << "obexftpd" << "-b";
     // connect to the necessary slots
     connect(m_rec,  SIGNAL(processExited(Opie::Core::OProcess*) ),
             this,  SLOT(slotExited(Opie::Core::OProcess*) ) );
 
     connect(m_rec,  SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int ) ),
             this,  SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) );
 
     if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         emit done( false );
         delete m_rec;
         m_rec = 0;
     }
 }
 
 void BtObex::send( const QString& fileName, const QString& bdaddr) {
     // if currently receiving stop it send receive
     m_count = 0;
     m_file = fileName;
     m_bdaddr = bdaddr;
     if (m_rec != 0 ) {
         if (m_rec->isRunning() ) {
             emit error(-1 );
             delete m_rec;
             m_rec = 0;
 
         }else{
             emit error( -1 ); // we did not delete yet but it's not running slotExited is pending
             return;
         }
     }
     //Now we need to find out if the OBEX push is supported for this device
     //And get the port number
     if (!btManager) {
         btManager = new Manager("hci0");
         connect(btManager,
             SIGNAL(foundServices(const QString&, Services::ValueList)),
             this, SLOT(slotFoundServices(const QString&, Services::ValueList)));
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index dbbb7b3..8432d16 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -47,195 +47,206 @@ void SendWidget::initUI() {
     connect(m_btobex, SIGNAL(error(int) ),
             this, SLOT(slotBtError(int) ) );
     connect(m_btobex, SIGNAL(sent(bool) ),
             this, SLOT(slotBtSent(bool) ) );
     connect(m_btobex, SIGNAL(currentTry(unsigned int) ),
             this, SLOT(slotBtTry(unsigned int) ) );
 
     chan = new QCopChannel("QPE/BluetoothBack", this );
     connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
             this, SLOT(dispatchBt(const QCString&,const QByteArray&) ) );
 
 }
 
 /*
  * in send we'll first set everything up
  * and then wait for a list of devices.
  */
 void SendWidget::send( const QString& file, const QString& desc ) {
     m_file = file;
     m_irDa.clear();
     m_start = 0;
 
     fileToSend->setText(desc.isEmpty() ? file : desc );
     scan_for_receivers();
 }
 
 int SendWidget::addReceiver(const char *r, const char *icon)
 {
     QListViewItem * item = new QListViewItem( receiverList, 0 );
     item->setText( 0, r);
     item->setPixmap( 1, Resource::loadPixmap( icon ) );
 
     int id=receivers.count();
     receivers[id]=item;
     return id;
 }
 
 bool SendWidget::receiverSelected(int id)
 {
     return (bool)(receivers[id]->pixmap(2) != NULL);
 }
 
 void SendWidget::setReceiverStatus( int id, const QString& status ) {
     if ( !receivers.contains(id) ) return;
     receivers[id]->setText(3, status );
 }
 
 void SendWidget::slotIrDaDevices( const QStringList& list) {
-    for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
-        int id = addReceiver(*it, "obex/irda.png");
-        m_irDa.insert( id, (*it) );
+    for (QStringList::ConstIterator it = list.begin(); 
+        it != list.end(); ++it ) {
+        int id = addReceiver(*it, "obex/irda.png");
+        m_irDa.insert( id, (*it) );
     }
     irdaStatus->setText( tr("ready."));
     m_irDaIt = m_irDa.begin();
 
 }
 
 void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) {
-    for(QMap<QString, QString>::ConstIterator it = str.begin(); it != str.end(); ++it ) {
-        int id = addReceiver(it.key(), "obex/bt.png");
+    for(QMap<QString, QString>::ConstIterator it = str.begin(); 
+        it != str.end(); ++it ) {
+        int id = addReceiver(it.key(), "obex/bt.png");
         m_bt.insert( id, Pair( it.key(), it.data() ) );
     }
     btStatus->setText(tr("ready."));
     m_btIt = m_bt.begin();
 
 }
 void SendWidget::slotSelectedDevice( int, int ) {
 /*    if ( name ==  m_irDeSearch ) {
         for (QMap<int, QString>::Iterator it= m_irDa.begin(); it != m_irDa.end(); ++it )
             m_devBox->removeDevice( it.key() );
 
         QCopEnvelope e2("QPE/IrDaApplet", "listDevices()");
         }*/
 }
 void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) {
     if ( str == "devices(QStringList)" ) {
         QDataStream stream( ar, IO_ReadOnly );
         QStringList list;
         stream >> list;
         slotIrDaDevices( list );
     }
 }
 void SendWidget::slotIrError( int ) {
     irdaStatus->setText(tr("error :("));
 }
 void SendWidget::slotIrSent( bool b) {
     QString text = b ? tr("Sent") : tr("Failure");
     setReceiverStatus( m_irDaIt.key(), text );
     ++m_irDaIt;
     slotStartIrda();
 }
 void SendWidget::slotIrTry(unsigned int trI) {
     setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) ));
 }
 void SendWidget::slotStartIrda() {
-        if ( !m_irDa.count() ) return;
-    if ( m_irDaIt == m_irDa.end() ) {
+    if ( !m_irDa.count() ) 
+        return;
+    if ( m_irDaIt == m_irDa.end() || !receiverSelected(m_irDaIt.key())) {
         irdaStatus->setText(tr("complete."));
         return;
     }
     setReceiverStatus( m_irDaIt.key(), tr("Start sending") );
     m_obex->send( m_file );
 }
 
 void SendWidget::dispatchBt( const QCString& str, const QByteArray& ar ) {
     if ( str == "devices(QStringMap)" ) {
         QDataStream stream( ar, IO_ReadOnly );
-        QMap<QString, QString> btmap;
+        QMap<QString, QString> btmap;
         stream >> btmap;
         slotBTDevices( btmap );
     }
 }
 void SendWidget::slotBtError( int ) {
     btStatus->setText(tr("error :("));    
 }
 void SendWidget::slotBtSent( bool b) {
     QString text = b ? tr("Sent") : tr("Failure");
     setReceiverStatus( m_btIt.key(), text );
     ++m_btIt;
     slotStartBt();
 }
 void SendWidget::slotBtTry(unsigned int trI) {
     setReceiverStatus( m_btIt.key(), tr("Try %1").arg( QString::number( trI ) ) );
 }
 void SendWidget::slotStartBt() {
     // skip past unselected receivers
     while((m_btIt != m_bt.end()) && !receiverSelected(m_btIt.key()))
-          ++m_btIt;
+        ++m_btIt;
     if (m_btIt == m_bt.end() ) {
         btStatus->setText(tr("complete."));
         return;
     }
     setReceiverStatus( m_btIt.key(), tr("Start sending") );
     m_btobex->send( m_file, m_btIt.data().second() );
 }
 
 void SendWidget::send_to_receivers() {
     slotStartIrda();
     slotStartBt();
 }
 
 void SendWidget::scan_for_receivers()
 {
     receiverList->clear();
     receivers.clear();
     sendButton->setDisabled( true );
 
     if ( !QCopChannel::isRegistered("QPE/IrDaApplet") )
     {
         irdaStatus->setText(tr("not enabled."));
     }
     else
     {
         QCopEnvelope e1("QPE/IrDaApplet", "enableIrda()");
         irdaStatus->setText(tr("searching..."));
         sendButton->setEnabled( true );
         QCopEnvelope e2("QPE/IrDaApplet", "listDevices()");
     }
 
     if ( !QCopChannel::isRegistered("QPE/Bluetooth") )
     {
         btStatus->setText(tr("not enabled."));
     }
     else
     {
         QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()");
         btStatus->setText(tr("searching..."));
         sendButton->setEnabled( true );
         QCopEnvelope e3("QPE/Bluetooth", "listDevices()");
     }
 }
 
 void SendWidget::toggle_receiver(QListViewItem* item)
 {
     // toggle the state of an individual receiver.
     if(item->pixmap(2))
         item->setPixmap(2,QPixmap());
     else
-        item->setPixmap(2,Resource::loadPixmap("backup/check.png"));
+        item->setPixmap(2,Resource::loadPixmap("obex/check.png"));
 }
 
 
-void SendWidget::closeEvent( QCloseEvent* e) {
-    obexSendBase::closeEvent(e);
-    QCopEnvelope e0("QPE/IrDaApplet", "disableIrda()");
-    QCopEnvelope e1("QPE/Bluetooth", "disableBluetooth()");
+void SendWidget::closeEvent( QCloseEvent* evt) {
+    delete m_obex;
+    m_obex = NULL;
+    delete m_btobex;
+    m_btobex = NULL;
+    obexSendBase::closeEvent(evt);
+    {
+        QCopEnvelope e("QPE/IrDaApplet", "disableIrda()");
+    }
+    {
+        QCopEnvelope e("QPE/Bluetooth", "disableBluetooth()");
+    }
 }
 
 void SendWidget::userDone() {
     close();
 }
 
 QString SendWidget::file()const {
     return m_file;
 }