fixed type and getting closer to finish

4 files changed, 17 insertions, 7 deletions

diff --git a/core/applets/obex/.cvsignore b/core/applets/obex/.cvsignore
index c7899af..8fde018 100644
--- a/core/applets/obex/.cvsignore
+++ b/core/applets/obex/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
+Makefile.in
 moc*
diff --git a/core/applets/obex/obex.cc b/core/applets/obex/obex.cc
index fc0be3b..43041f5 100644
--- a/core/applets/obex/obex.cc
+++ b/core/applets/obex/obex.cc
@@ -98,4 +98,4 @@ void Obex::sendNow(){
 void Obex::slotExited(OProcess* proc ){
-    if (proc == m_rec ) { // recieve process
-        recieved();
+    if (proc == m_rec ) { // receive process
+        received();
     }else if ( proc == m_send ) {
@@ -105,3 +105,3 @@ void Obex::slotExited(OProcess* proc ){
 void Obex::slotStdOut(OProcess* proc, char* buf, int len){
-    if ( proc == m_rec ) { // only recieve
+    if ( proc == m_rec ) { // only receive
         QCString cstring( buf,  len );
@@ -111,3 +111,3 @@ void Obex::slotStdOut(OProcess* proc, char* buf, int len){
 
-void Obex::recieved() {
+void Obex::received() {
   if (m_rec->normalExit() ) {
@@ -115,2 +115,3 @@ void Obex::recieved() {
           QString filename = parseOut();
+          qWarning("ACHTUNG");
           emit receivedFile( filename );
diff --git a/core/applets/obex/obex.h b/core/applets/obex/obex.h
index 2ce44f2..781fca2 100644
--- a/core/applets/obex/obex.h
+++ b/core/applets/obex/obex.h
@@ -77,3 +77,3 @@ private slots:
       QString parseOut();
-      void recieved();
+      void received();
       void sendEnd();
diff --git a/core/applets/obex/obeximpl.cc b/core/applets/obex/obeximpl.cc
index 1a1c922..7df933a 100644
--- a/core/applets/obex/obeximpl.cc
+++ b/core/applets/obex/obeximpl.cc
@@ -30,2 +30,3 @@ ObexImpl::ObexImpl( )
 }
+
 ObexImpl::~ObexImpl() {
@@ -35,2 +36,3 @@ ObexImpl::~ObexImpl() {
 }
+
 QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
@@ -46,4 +48,4 @@ QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
   return QS_OK;
-
 }
+
 void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
@@ -66,3 +68,3 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
   }else if(msg == "receive(int)" ) { // open a GUI
-      m_recvgui->showMaximized();
+      //m_recvgui->showMaximized();
       int receiveD = 0;
@@ -107,2 +109,3 @@ void ObexImpl::slotError( int errorCode) {
 }
+
 // Received a file via beam
@@ -123,2 +126,7 @@ void ObexImpl::slotReceivedFile( const QString &fileName ) {
     } // now prompt and then add it
+
+    m_recvgui->PixmapLabel->setPixmap(lnk.pixmap());
+    m_recvgui->TextLabel1_2->setText(lnk.name());
+    m_recvgui->showMaximized();
+
     QCString str= "QPE/Application/";