| -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 @@ -14,13 +14,13 @@ Obex::Obex( QObject *parent, const char* 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; } @@ -103,22 +103,22 @@ void Obex::slotExited(OProcess* proc ){ }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; 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 @@ -57,20 +57,23 @@ void Receiver::handleDateTodo( const QString& str ) { */ 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() { @@ -103,12 +106,13 @@ 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 ); } /* |