Send Receive working now it's time for a gui

2 files changed, 11 insertions, 3 deletions

diff --git a/core/applets/obex/obex.cc b/core/applets/obex/obex.cc
index 582ebbc..f35d57a 100644
--- a/core/applets/obex/obex.cc
+++ b/core/applets/obex/obex.cc
@@ -1,119 +1,126 @@
 
+#include <qapplication.h>
 
 #include <opie/oprocess.h>
 #include "obex.h"
 
 using namespace  OpieObex;
 
 Obex::Obex( QObject *parent, const char* name ) 
   : QObject(parent, name )
 {
   m_rec = 0;
   m_send=0;
   m_count = 0;
 };
 Obex::~Obex() { 
   delete m_rec;
   delete m_send;
 }
 void Obex::receive()  {
+  qWarning("Receive" );
    m_rec = new OProcess();
    *m_rec << "irobex_palm3";
    // connect to the necessary slots
    connect(m_rec,  SIGNAL(processExited(OProcess*) ),
 	   this,  SLOT(slotExited(OProcess*) ) );
    
    connect(m_rec,  SIGNAL(receivedStdout(OProcess*, char*,  int ) ),
 	   this,  SLOT(slotStdOut(OProcess*, char*, int) ) );
    
    if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
      qWarning("could not start :(");
      emit done( false );
    }
    emit currentTry(m_count );
 
 }
 void Obex::send( const QString& fileName) {
   m_count = 0;
   m_file = fileName;
   sendNow();
 }
 void Obex::sendNow(){
-  if ( m_count >= 15 ) { // could not send
+  if ( m_count >= 25 ) { // could not send
     emit error(-1 );
+    return;
   }
   // OProcess inititialisation
   m_send = new OProcess();
   *m_send << "irobex_palm3";
   *m_send << m_file;
   
   // connect to slots Exited and and StdOut
   connect(m_send,  SIGNAL(processExited(OProcess*) ),
 	  this, SLOT(slotExited(OProcess*)) );
   connect(m_send,  SIGNAL(receivedStdout(OProcess*, char*,  int )), 
 	  this, SLOT(slotStdOut(OProcess*, char*, int) ) );
   // now start it
   if (!m_send->start(/*OProcess::NotifyOnExit,  OProcess::AllOutput*/ ) ) {
-    m_count = 15;
+    qWarning("could not send" );
+    m_count = 25;
     emit error(-1 );
   }
   // end
   m_count++;
   emit currentTry( m_count );
 }
 
 void Obex::slotExited(OProcess* proc ){
    if (proc == m_rec ) { // recieve process
         recieved();
     }else if ( proc == m_send ) {
         sendEnd();
     }
 }
 void Obex::slotStdOut(OProcess* proc, char* buf, int len){
   if ( proc == m_rec ) { // only recieve
     QCString cstring( buf,  len );
     m_outp.append( cstring.data() );
   }
 }
 
 void Obex::recieved() {
   if (m_rec->normalExit() ) {
     if ( m_rec->exitStatus() == 0 ) { // we got one
       QString filename = parseOut();
       emit receivedFile( filename );
     }
   }else{
     emit error(-1);
   };
   delete m_rec;
 }
 void Obex::sendEnd() {
   if (m_send->normalExit() ) {
     if ( m_send->exitStatus() == 0 ) {
       delete m_send;
       m_send=0;
+      qWarning("done" );
       emit sent();
     }else if (m_send->exitStatus() == 255 ) { // it failed maybe the other side wasn't ready
       // let's try it again
       delete m_send;
       m_send = 0;
+      qWarning("try sending again" );
       sendNow();
     }
   }else {
     emit error( -1 );
     delete m_send;
     m_send = 0;
   }
 }
 QString Obex::parseOut(     ){
   QString path;
   QStringList list = QStringList::split("\n",  m_outp);
   QStringList::Iterator it;
   for (it = list.begin(); it != list.end(); ++it ) {
     if ( (*it).startsWith("Wrote"  ) ) {
       QStringList pathes = QStringList::split(' ', (*it) );
       path = pathes[1];
+      qWarning("path %s", path.latin1() );
     }
   }
   return path;
 }
diff --git a/core/applets/obex/obeximpl.cc b/core/applets/obex/obeximpl.cc
index fa2a30a..82ff1a1 100644
--- a/core/applets/obex/obeximpl.cc
+++ b/core/applets/obex/obeximpl.cc
@@ -1,57 +1,58 @@
 
 #include <qdatastream.h>
 #include <qpe/qcom.h>
 
 #include "obex.h"
 #include "obeximpl.h"
 
 
 
 using namespace OpieObex;
 
 ObexImpl::ObexImpl( )
  :  QObject() {
   // register to a channel
   qWarning( "c'tor" );
   m_obex = new Obex(this, "obex");
   m_chan = new QCopChannel("QPE/Obex" );
   connect(m_chan, SIGNAL(received(const QCString&,  const QByteArray& ) ),
 	   this, SLOT(slotMessage(const QCString&, const QByteArray&) ) );
 }
 ObexImpl::~ObexImpl() {
   delete m_obex;
   delete m_chan;
 }
 QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
   *iface = 0;
   if( uuid  ==  IID_QUnknown )
     *iface = this;
   else if( uuid == IID_ObexInterface )
     *iface = this;
 
   qWarning("query" );
   if(*iface )
     (*iface)->addRef();
   return QS_OK;
 
 }
 void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
   QDataStream stream( data, IO_ReadOnly );
   qWarning("Message %s", msg.data() );
   if(msg == "send(QString,QString,QString)" ) {
     QString desc;
     stream >> desc;
     QString filename;
     stream >> filename;
     m_obex->send(filename );
     QCopEnvelope e ("QPE/Obex", "done(QString)" );
     e << filename;
-  }else if(msg == "receive(bool)" ) {
+  }else if(msg == "receive(bool)" ) { // open a GUI
+    m_obex->receive();
     ;
   }
 }
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( ObexImpl )
 }