author | zecke <zecke> | 2005-03-29 23:30:39 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-03-29 23:30:39 (UTC) |
commit | db876361603ccf1664698df926a3c61d32315101 (patch) (side-by-side diff) | |
tree | 21425cbda11c9b8bbfa8a71d1b34c0479b3de284 /core | |
parent | 6d8f326cb4429a45c417ecdc04f58e832017aa66 (diff) | |
download | opie-db876361603ccf1664698df926a3c61d32315101.zip opie-db876361603ccf1664698df926a3c61d32315101.tar.gz opie-db876361603ccf1664698df926a3c61d32315101.tar.bz2 |
Beaming Fix:
Recievers couldn't handle paths inside the obex push. As a workaround
we will change the working directory of the process and use the filename
inside that directory.
-rw-r--r-- | core/obex/obex.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/obex/obex.cc b/core/obex/obex.cc index 5dfcfb5..36634ec 100644 --- a/core/obex/obex.cc +++ b/core/obex/obex.cc @@ -29,98 +29,100 @@ Obex::Obex( QObject *parent, const char* name ) }; Obex::~Obex() { delete m_rec; delete m_send; } void Obex::receive() { m_receive = true; m_outp = QString::null; m_rec = new OProcess(); *m_rec << "irobex_palm3"; // connect to the necessary slots connect(m_rec, SIGNAL(processExited(Opie::Core::OProcess*) ), this, SLOT(slotExited(Opie::Core::OProcess*) ) ); connect(m_rec, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) ); if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { emit done( false ); delete m_rec; m_rec = 0; } } void Obex::send( const QString& fileName) { // if currently receiving stop it send receive m_count = 0; m_file = fileName; if (m_rec != 0 ) { if (m_rec->isRunning() ) { emit error(-1 ); delete m_rec; m_rec = 0; }else{ emit error( -1 ); // we did not delete yet but it's not running slotExited is pending return; } } sendNow(); } void Obex::sendNow(){ if ( m_count >= 25 ) { // could not send emit error(-1 ); emit sent(false); return; } // OProcess inititialisation m_send = new OProcess(); + m_send->setWorkingDirectory( QFileInfo(m_file).dirPath(true) ); + *m_send << "irobex_palm3"; - *m_send << QFile::encodeName(m_file); + *m_send << QFile::encodeName(QFileInfo(m_file).fileName()); // connect to slots Exited and and StdOut connect(m_send, SIGNAL(processExited(Opie::Core::OProcess*) ), this, SLOT(slotExited(Opie::Core::OProcess*)) ); connect(m_send, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int )), this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) ); // now start it if (!m_send->start(/*OProcess::NotifyOnExit, OProcess::AllOutput*/ ) ) { m_count = 25; emit error(-1 ); delete m_send; m_send=0; } // end m_count++; emit currentTry( m_count ); } void Obex::slotExited(OProcess* proc ){ if (proc == m_rec ) // receive process received(); else if ( proc == m_send ) sendEnd(); } void Obex::slotStdOut(OProcess* proc, char* buf, int len){ if ( proc == m_rec ) { // only receive QByteArray ar( len ); memcpy( ar.data(), buf, len ); m_outp.append( ar ); } } void Obex::received() { if (m_rec->normalExit() ) { if ( m_rec->exitStatus() == 0 ) { // we got one QString filename = parseOut(); emit receivedFile( filename ); } }else{ emit done(false); }; delete m_rec; m_rec = 0; receive(); } |