-rw-r--r-- | core/obex/btobex.cpp | 1 | ||||
-rw-r--r-- | core/obex/obexsend.cpp | 29 |
2 files changed, 20 insertions, 10 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 | |||
@@ -34,7 +34,6 @@ BtObex::BtObex( QObject *parent, const char* name ) | |||
34 | }; | 34 | }; |
35 | 35 | ||
36 | BtObex::~BtObex() { | 36 | BtObex::~BtObex() { |
37 | if (btManager) | ||
38 | delete btManager; | 37 | delete btManager; |
39 | delete m_rec; | 38 | delete m_rec; |
40 | delete m_send; | 39 | delete m_send; |
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 | |||
@@ -92,7 +92,8 @@ void SendWidget::setReceiverStatus( int id, const QString& status ) { | |||
92 | } | 92 | } |
93 | 93 | ||
94 | void SendWidget::slotIrDaDevices( const QStringList& list) { | 94 | void SendWidget::slotIrDaDevices( const QStringList& list) { |
95 | for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { | 95 | for (QStringList::ConstIterator it = list.begin(); |
96 | it != list.end(); ++it ) { | ||
96 | int id = addReceiver(*it, "obex/irda.png"); | 97 | int id = addReceiver(*it, "obex/irda.png"); |
97 | m_irDa.insert( id, (*it) ); | 98 | m_irDa.insert( id, (*it) ); |
98 | } | 99 | } |
@@ -102,7 +103,8 @@ void SendWidget::slotIrDaDevices( const QStringList& list) { | |||
102 | } | 103 | } |
103 | 104 | ||
104 | void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) { | 105 | void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) { |
105 | for(QMap<QString, QString>::ConstIterator it = str.begin(); it != str.end(); ++it ) { | 106 | for(QMap<QString, QString>::ConstIterator it = str.begin(); |
107 | it != str.end(); ++it ) { | ||
106 | int id = addReceiver(it.key(), "obex/bt.png"); | 108 | int id = addReceiver(it.key(), "obex/bt.png"); |
107 | m_bt.insert( id, Pair( it.key(), it.data() ) ); | 109 | m_bt.insert( id, Pair( it.key(), it.data() ) ); |
108 | } | 110 | } |
@@ -139,8 +141,9 @@ void SendWidget::slotIrTry(unsigned int trI) { | |||
139 | setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) )); | 141 | setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) )); |
140 | } | 142 | } |
141 | void SendWidget::slotStartIrda() { | 143 | void SendWidget::slotStartIrda() { |
142 | if ( !m_irDa.count() ) return; | 144 | if ( !m_irDa.count() ) |
143 | if ( m_irDaIt == m_irDa.end() ) { | 145 | return; |
146 | if ( m_irDaIt == m_irDa.end() || !receiverSelected(m_irDaIt.key())) { | ||
144 | irdaStatus->setText(tr("complete.")); | 147 | irdaStatus->setText(tr("complete.")); |
145 | return; | 148 | return; |
146 | } | 149 | } |
@@ -222,14 +225,22 @@ void SendWidget::toggle_receiver(QListViewItem* item) | |||
222 | if(item->pixmap(2)) | 225 | if(item->pixmap(2)) |
223 | item->setPixmap(2,QPixmap()); | 226 | item->setPixmap(2,QPixmap()); |
224 | else | 227 | else |
225 | item->setPixmap(2,Resource::loadPixmap("backup/check.png")); | 228 | item->setPixmap(2,Resource::loadPixmap("obex/check.png")); |
226 | } | 229 | } |
227 | 230 | ||
228 | 231 | ||
229 | void SendWidget::closeEvent( QCloseEvent* e) { | 232 | void SendWidget::closeEvent( QCloseEvent* evt) { |
230 | obexSendBase::closeEvent(e); | 233 | delete m_obex; |
231 | QCopEnvelope e0("QPE/IrDaApplet", "disableIrda()"); | 234 | m_obex = NULL; |
232 | QCopEnvelope e1("QPE/Bluetooth", "disableBluetooth()"); | 235 | delete m_btobex; |
236 | m_btobex = NULL; | ||
237 | obexSendBase::closeEvent(evt); | ||
238 | { | ||
239 | QCopEnvelope e("QPE/IrDaApplet", "disableIrda()"); | ||
240 | } | ||
241 | { | ||
242 | QCopEnvelope e("QPE/Bluetooth", "disableBluetooth()"); | ||
243 | } | ||
233 | } | 244 | } |
234 | 245 | ||
235 | void SendWidget::userDone() { | 246 | void SendWidget::userDone() { |