summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/libopieobex0.control6
-rw-r--r--core/obex/obexhandler.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/core/obex/libopieobex0.control b/core/obex/libopieobex0.control
index d74b51c..6df9f36 100644
--- a/core/obex/libopieobex0.control
+++ b/core/obex/libopieobex0.control
@@ -1,9 +1,9 @@
1Files: plugins/obex/libopieobex.so* 1Files: plugins/obex/libopieobex.so* pics/obex/*
2Priority: optional 2Priority: optional
3Section: opie/system 3Section: opie/system
4Maintainer: Holger Freyther <zecke@handhelds.org> 4Maintainer: hOlgar Freyther <zecke@handhelds.org>
5Architecture: arm 5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION.1 6Version: $QPE_VERSION-$SUB_VERSION.1
7Depends: opie-base ($QPE_VERSION), openobex 7Depends: opie-base ($QPE_VERSION), openobex
8Description: Irda obex lib 8Description: Irda obex lib
9 \ No newline at end of file 9
diff --git a/core/obex/obexhandler.cpp b/core/obex/obexhandler.cpp
index 16e1c2f..6509d12 100644
--- a/core/obex/obexhandler.cpp
+++ b/core/obex/obexhandler.cpp
@@ -39,27 +39,27 @@ void ObexHandler::doReceive(bool b) {
39 m_receiver= new Receiver; 39 m_receiver= new Receiver;
40 } 40 }
41} 41}
42void ObexHandler::slotSent() { 42void ObexHandler::slotSent() {
43 QString file = m_sender->file(); 43 QString file = m_sender->file();
44 delete m_sender; 44 delete m_sender;
45 m_sender = 0; 45 m_sender = 0;
46 QCopEnvelope e ("QPE/Obex", "done(QString)" ); 46 QCopEnvelope e ("QPE/Obex", "done(QString)" );
47 e << file; 47 e << file;
48 doReceive(m_wasRec ); 48 doReceive(m_wasRec );
49 m_wasRec = false; 49 m_wasRec = false;
50} 50}
51void ObexHandler::irdaMessage( const QCString& msg, const QByteArray& data) { 51void ObexHandler::irdaMessage( const QCString& msg, const QByteArray& data) {
52 QDataStream stream( data, IO_ReadOnly ); 52 QDataStream stream( data, IO_ReadOnly );
53 if ( msg == "send(QString,QString,QString)" ) { 53 if ( msg == "send(QString,QString,QString)" ) {
54 QString name, desc; 54 QString name, desc;
55 stream >> name;
56 stream >> desc; 55 stream >> desc;
56 stream >> name;
57 m_wasRec = (m_receiver != 0 ); 57 m_wasRec = (m_receiver != 0 );
58 doReceive( false ); 58 doReceive( false );
59 doSend(desc, name); 59 doSend(name, desc);
60 }else if (msg == "receive(int)") { 60 }else if (msg == "receive(int)") {
61 int rec; 61 int rec;
62 stream >> rec; 62 stream >> rec;
63 doReceive(rec); 63 doReceive(rec);
64 } 64 }
65} 65}