summaryrefslogtreecommitdiff
authorzecke <zecke>2005-03-29 23:30:39 (UTC)
committer zecke <zecke>2005-03-29 23:30:39 (UTC)
commitdb876361603ccf1664698df926a3c61d32315101 (patch) (side-by-side diff)
tree21425cbda11c9b8bbfa8a71d1b34c0479b3de284
parent6d8f326cb4429a45c417ecdc04f58e832017aa66 (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/obex.cc4
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
@@ -65,26 +65,28 @@ void Obex::send( const QString& fileName) { // if currently receiving stop it se
}
}
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;