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,6 +1,7 @@
 Makefile
+Makefile.in
 moc*
 obexdlg.cpp
 obexdlg.h
 obexinc.cpp
 obexinc.h
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
@@ -87,41 +87,42 @@ void Obex::sendNow(){
         qWarning("could not send" );
         m_count = 25;
         emit error(-1 );
         delete m_send;
         m_send=0;
     }
     // end
     m_count++;
     emit currentTry( m_count );
 }
 
 void Obex::slotExited(OProcess* proc ){
-    if (proc == m_rec ) { // recieve process
-        recieved();
+    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 recieve
+    if ( proc == m_rec ) { // only receive
         QCString cstring( buf,  len );
         m_outp.append( cstring.data() );
     }
 }
 
-void Obex::recieved() {
+void Obex::received() {
   if (m_rec->normalExit() ) {
       if ( m_rec->exitStatus() == 0 ) { // we got one
           QString filename = parseOut();
+          qWarning("ACHTUNG");
           emit receivedFile( filename );
       }
   }else{
       emit done(false);
   };
   delete m_rec;
   m_rec = 0;
   receive();
 }
 
 void Obex::sendEnd() {
   if (m_send->normalExit() ) {
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
@@ -66,20 +66,20 @@ private slots:
        */
 
       //void send(const QString&);
 
       // the process exited
       void slotExited(OProcess* proc) ;
       void slotStdOut(OProcess*, char*, int);
       void slotError();
 
   private:
       void sendNow();
       QString parseOut();
-      void recieved();
+      void received();
       void sendEnd();
 
   };
 };
 
 
 #endif
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
@@ -19,61 +19,63 @@ ObexImpl::ObexImpl( )
  :  QObject() {
   // register to a channel
   qWarning( "c'tor" );
   m_obex = new Obex(this, "obex");
   m_sendgui = new ObexDlg();
   m_recvgui = new ObexInc();
   m_chan = new QCopChannel("QPE/Obex" );
   connect(m_chan, SIGNAL(received(const QCString&,  const QByteArray& ) ),
 	   this, SLOT(slotMessage(const QCString&, const QByteArray&) ) );
   connect(m_obex, SIGNAL(receivedFile(const QString& ) ),
           this,  SLOT(slotReceivedFile(const QString& ) ) );
 }
+
 ObexImpl::~ObexImpl() {
   delete m_obex;
   delete m_chan;
   delete m_sendgui;
 }
+
 QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
   *iface = 0;
   if( uuid  ==  IID_QUnknown )
     *iface = this;
   else if( uuid == IID_ObexInterface )
     *iface = this;
 
   qWarning("query" );
   if(*iface )
     (*iface)->addRef();
   return QS_OK;
-
 }
+
 void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
   QDataStream stream( data, IO_ReadOnly );
   qWarning("Message %s", msg.data() );
   if(msg == "send(QString,QString,QString)" ) {
     QString desc;
     stream >> desc;
     stream >> m_name;
     m_sendgui->raise(); // should be on top
     m_sendgui->showMaximized();
     m_sendgui->lblPath->setText(m_name);
     connect( (QObject*)m_sendgui->PushButton2, SIGNAL(clicked()),
              this, SLOT(slotCancelSend()));
     m_obex->send(m_name );
     connect( (QObject*)m_obex, SIGNAL( sent() ), this,
              SLOT( slotSent() ) );
     connect( (QObject*)m_obex, SIGNAL( error(int) ),  this,
              SLOT( slotSent() ) );
   }else if(msg == "receive(int)" ) { // open a GUI
-      m_recvgui->showMaximized();
+      //m_recvgui->showMaximized();
       int receiveD = 0;
       stream >> receiveD;
       if ( receiveD == 1)
           m_obex->receive();
       else
           m_obex->setReceiveEnabled( false );
 
   } else if (msg =="done(QString)") {
       QString text;
       stream >> text;
       m_sendgui->lblPath->setText(tr("Done transfering " + text));
 
@@ -96,40 +98,46 @@ void ObexImpl::slotSent() {
     m_sendgui->hide();
 }
 
 void ObexImpl::slotError( int errorCode) {
 
     QString errorString = "";
     if (errorCode == -1) {
         errorString = "test";
     }
     qDebug("Error: " + errorString);
     m_sendgui->hide();
 }
+
 // Received a file via beam
 // check for mime  type and then either
 // add to App via setDocument
 void ObexImpl::slotReceivedFile( const QString &fileName ) {
     qWarning("filename %s",  fileName.latin1() );
     DocLnk lnk( fileName );
     QString exec = lnk.exec();
     qWarning("executing %s", exec.latin1() );
     if ( exec.isEmpty() || exec == "" ) {
         qWarning("empty");
         if ( fileName.right(4) == ".vcf" )
             exec = "addressbook";
         else if ( fileName.right(4) == ".vcs" ) {
             exec = "datebook";
         }
     } // 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/";
     str += exec.latin1();
     qWarning("channel %s", str.data() );
     QCopEnvelope e(str ,  "setDocument(QString)" );
     e << fileName;
 
 }
 
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( ObexImpl )