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,7 +1,8 @@
 
+#include <qapplication.h>
 
 #include <opie/oprocess.h>
 #include "obex.h"
 
 using namespace  OpieObex;
 
@@ -14,12 +15,13 @@ Obex::Obex( QObject *parent, const char* name )
 };
 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*) ) );
    
@@ -36,14 +38,15 @@ void Obex::receive()  {
 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;
   
@@ -51,13 +54,14 @@ void Obex::sendNow(){
   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 );
 }
@@ -89,17 +93,19 @@ void Obex::recieved() {
 }
 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;
@@ -110,10 +116,11 @@ QString Obex::parseOut(     ){
   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
@@ -43,13 +43,14 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
     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()
 {