3 files changed, 15 insertions, 11 deletions

diff --git a/core/obex/obex.cc b/core/obex/obex.cc
index 83d1faf..92cd317 100644
--- a/core/obex/obex.cc
+++ b/core/obex/obex.cc
@@ -2,2 +2,3 @@
 #include <qapplication.h>
+#include <qfile.h>
 #include <qmessagebox.h>
@@ -50,3 +51,3 @@ void Obex::send( const QString& fileName) { // if currently receiving stop it se
     m_file = fileName;
-    qWarning("send");
+    qWarning("send %s", fileName.latin1() );
     if (m_rec != 0 ) {
@@ -77,3 +78,3 @@ void Obex::sendNow(){
     *m_send << "irobex_palm3";
-    *m_send << m_file;
+    *m_send << QFile::encodeName(m_file);
 
diff --git a/core/obex/obexhandler.cpp b/core/obex/obexhandler.cpp
index f71a233..16e1c2f 100644
--- a/core/obex/obexhandler.cpp
+++ b/core/obex/obexhandler.cpp
@@ -58,3 +58,3 @@ void ObexHandler::irdaMessage( const QCString& msg, const QByteArray& data) {
         doReceive( false );
-        doSend(name, desc);
+        doSend(desc, name);
     }else if (msg == "receive(int)") {
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index a2e4c16..d5ebd81 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -34,3 +34,3 @@ void SendWidget::initUI() {
     connect(chan, SIGNAL(received(const QCString&, const QByteArray& ) ),
-            this, SLOT(dispatchBt(const QCString&, const QByteArray& ) ) );
+            this, SLOT(dispatchIrda(const QCString&, const QByteArray& ) ) );
 
@@ -38,3 +38,3 @@ void SendWidget::initUI() {
     connect(chan, SIGNAL(received(const QCString&, const QByteArray& ) ),
-            this, SLOT(dispatchIrda(const QCString&, const QByteArray& ) ) );
+            this, SLOT(dispatchBt(const QCString&, const QByteArray& ) ) );
 
@@ -105,5 +105,5 @@ void SendWidget::send( const QString& file, const QString& desc ) {
     }
-    QTimer::singleShot(5000, this, SLOT(testIt() ) );
 }
 void SendWidget::slotIrDaDevices( const QStringList& list) {
+    qWarning("slot it irda devices ");
     m_irDa = list;
@@ -112,3 +112,4 @@ void SendWidget::slotIrDaDevices( const QStringList& list) {
         m_devBox->addDevice( (*it), DeviceBox::IrDa, tr("Scheduling for beam.") );
-    m_devBox->removeDevice( tr("Search for IrDa Devices.") );
+
+    m_devBox->removeDevice( tr("Searching for IrDa Devices.") );
 
@@ -128,2 +129,3 @@ void SendWidget::slotSelectedDevice( const QString& name, int dev ) {
             m_devBox->removeDevice( (*it) );
+
         QCopEnvelope e2("QPE/IrDaApplet", "listDevices()");
@@ -133,3 +135,3 @@ void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) {
     qWarning("dispatch irda %s", str.data() );
-    if ( str == "listDevices(QStringList)" ) {
+    if ( str == "devices(QStringList)" ) {
         QDataStream stream( ar, IO_ReadOnly );
@@ -147,4 +149,5 @@ void SendWidget::slotIrError( int ) {
 void SendWidget::slotIrSent( bool b) {
+    qWarning("irda sent!!");
     QString text = b ? tr("Sent") : tr("Failure");
-    m_devBox->setStatus( m_irDa[m_start], text );
+//    m_devBox->setStatus( m_irDa[m_start], text );
     m_start++;
@@ -153,3 +156,3 @@ void SendWidget::slotIrSent( bool b) {
 void SendWidget::slotIrTry(unsigned int trI) {
-    m_devBox->setStatus( m_irDa[m_start], tr("Try %1").arg( QString::number( trI ) ) );
+//    m_devBox->setStatus( m_irDa[m_start], tr("Try %1").arg( QString::number( trI ) ) );
 }
@@ -160,3 +163,3 @@ void SendWidget::slotStartIrda() {
     }
-    m_devBox->setStatus( m_irDa[m_start], tr("Start sending") );
+//    m_devBox->setStatus( m_irDa[m_start], tr("Start sending") );
     m_obex->send( m_file );