summaryrefslogtreecommitdiff
authorzecke <zecke>2002-06-12 17:08:42 (UTC)
committer zecke <zecke>2002-06-12 17:08:42 (UTC)
commitd57ced2b9c8f3ac79bae54bef7d5026d24e2bb98 (patch) (side-by-side diff)
tree2db69c92fb707834b798f815f812cbf30b9f09b1
parentac707e366de561cabc8074b62025d143200869d7 (diff)
downloadopie-d57ced2b9c8f3ac79bae54bef7d5026d24e2bb98.zip
opie-d57ced2b9c8f3ac79bae54bef7d5026d24e2bb98.tar.gz
opie-d57ced2b9c8f3ac79bae54bef7d5026d24e2bb98.tar.bz2
Send Receive working now it's time for a gui
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/obex/obex.cc11
-rw-r--r--core/applets/obex/obeximpl.cc3
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,4 +1,5 @@
+#include <qapplication.h>
#include <opie/oprocess.h>
#include "obex.h"
@@ -17,6 +18,7 @@ Obex::~Obex() {
delete m_send;
}
void Obex::receive() {
+ qWarning("Receive" );
m_rec = new OProcess();
*m_rec << "irobex_palm3";
// connect to the necessary slots
@@ -39,8 +41,9 @@ void Obex::send( const QString& 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();
@@ -54,7 +57,8 @@ void Obex::sendNow(){
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
@@ -92,11 +96,13 @@ void Obex::sendEnd() {
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 {
@@ -113,6 +119,7 @@ QString Obex::parseOut( ){
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
@@ -46,7 +46,8 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
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();
;
}
}