author | zecke <zecke> | 2003-02-16 17:50:15 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-02-16 17:50:15 (UTC) |
commit | 62cc9d89378f281c11599f38c3ebe89886b69568 (patch) (side-by-side diff) | |
tree | 7499e9704f66820e785acc8c772e35b4f804aa80 | |
parent | e9e20c4e64b8b228af928822e3d4a49ed773dc2e (diff) | |
download | opie-62cc9d89378f281c11599f38c3ebe89886b69568.zip opie-62cc9d89378f281c11599f38c3ebe89886b69568.tar.gz opie-62cc9d89378f281c11599f38c3ebe89886b69568.tar.bz2 |
Fix getting files
-rw-r--r-- | core/obex/obex.cc | 8 | ||||
-rw-r--r-- | core/obex/receiver.cpp | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/core/obex/obex.cc b/core/obex/obex.cc index 92cd317..b8ed6e0 100644 --- a/core/obex/obex.cc +++ b/core/obex/obex.cc @@ -12,17 +12,17 @@ Obex::Obex( QObject *parent, const char* name ) : QObject(parent, name ) { m_rec = 0; m_send=0; m_count = 0; m_receive = false; connect( this, SIGNAL(error(int) ), // for recovering to receive SLOT(slotError() ) ); - connect( this, SIGNAL(sent() ), + connect( this, SIGNAL(sent(bool) ), SLOT(slotError() ) ); }; Obex::~Obex() { delete m_rec; delete m_send; } void Obex::receive() { m_receive = true; @@ -101,26 +101,26 @@ 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 - QCString cstring( buf, len ); - m_outp.append( cstring.data() ); + QString str = QString::fromUtf8( buf, len ); + m_outp.append( str ); } } void Obex::received() { if (m_rec->normalExit() ) { if ( m_rec->exitStatus() == 0 ) { // we got one QString filename = parseOut(); - qWarning("ACHTUNG"); + qWarning("ACHTUNG %s", filename.latin1() ); emit receivedFile( filename ); } }else{ emit done(false); }; delete m_rec; m_rec = 0; receive(); diff --git a/core/obex/receiver.cpp b/core/obex/receiver.cpp index 50ee6cb..d5a7271 100644 --- a/core/obex/receiver.cpp +++ b/core/obex/receiver.cpp @@ -55,24 +55,27 @@ void Receiver::handleDateTodo( const QString& str ) { * Handle other asks if it should accept the * beamed object and creates a DocLnk */ void Receiver::handleOther( const QString& other ) { OtherHandler* hand = new OtherHandler(); hand->handle( other ); } int Receiver::checkFile( const QString& file ) { + qWarning("check file!! %s", file.latin1() ); int ret; if (file.right(4) == ".vcs" ) { ret = Datebook; }else if ( file.right(4) == ".vcf") { ret = AddressBook; }else ret = Other; + + qWarning("check it now %d", ret ); return ret; } OtherHandler::OtherHandler() : QVBox() { QHBox* box = new QHBox(this); QLabel* lbl = new QLabel(box); @@ -101,16 +104,17 @@ OtherHandler::OtherHandler() } OtherHandler::~OtherHandler() { } void OtherHandler::handle( const QString& file ) { m_file = file; m_na->setText(file); DocLnk lnk(file); + qWarning(" %s %s", lnk.type().latin1(), lnk.icon().latin1() ); QString str = tr("<p>You received a file of type %1 (<img src=\"%2\"> )What do you want to do?").arg(lnk.type() ).arg(lnk.icon() ); m_view->setText( str ); } /* * hehe evil evil mmap ahead :) * we quickly copy the file and then we'll create a DocLnk for it |