2 files changed, 38 insertions, 6 deletions

diff --git a/core/applets/obex/obeximpl.cc b/core/applets/obex/obeximpl.cc
index 0c137af..1a1c922 100644
--- a/core/applets/obex/obeximpl.cc
+++ b/core/applets/obex/obeximpl.cc
@@ -1,11 +1,14 @@
 
 #include <qdatastream.h>
 #include <qmessagebox.h>
 
+
 #include <qpe/qcom.h>
+#include <qpe/applnk.h>
+
 #include <qlabel.h>
 
 #include "obex.h"
 #include "obeximpl.h"
 
 
@@ -19,12 +22,14 @@ ObexImpl::ObexImpl( )
   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;
 }
@@ -44,22 +49,23 @@ QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 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;
-    QString filename;
-    stream >> filename;
+    stream >> m_name;
     m_sendgui->raise(); // should be on top
     m_sendgui->showMaximized();
-    m_sendgui->lblPath->setText(filename);
+    m_sendgui->lblPath->setText(m_name);
     connect( (QObject*)m_sendgui->PushButton2, SIGNAL(clicked()),
              this, SLOT(slotCancelSend()));
-    m_obex->send(filename );
+    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();
       int receiveD = 0;
       stream >> receiveD;
       if ( receiveD == 1)
           m_obex->receive();
@@ -79,13 +85,13 @@ void ObexImpl::slotCancelSend() {
     //m_obex->cancel(); // not ready yet
     m_sendgui->hide();
 }
 
 void ObexImpl::slotDone(bool) {
     QCopEnvelope e ("QPE/Obex", "done(QString)" ); //but this into a slot
-    e << "Done!";
+    e << m_name;
 }
 
 void ObexImpl::slotSent() {
     m_sendgui->lblPath->setText("Done!");
     m_sendgui->hide();
 }
@@ -96,11 +102,35 @@ void ObexImpl::slotError( int errorCode) {
     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
+    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 )
 }
diff --git a/core/applets/obex/obeximpl.h b/core/applets/obex/obeximpl.h
index 4e5109f..8d10cf1 100644
--- a/core/applets/obex/obeximpl.h
+++ b/core/applets/obex/obeximpl.h
@@ -20,17 +20,19 @@ namespace OpieObex {
   private:
     ulong ref;
     Obex* m_obex; // obex lib
     QCopChannel *m_chan;
     ObexDlg *m_sendgui;
     ObexInc *m_recvgui;
+    QString m_name;
    private slots:
      void slotCancelSend();
      void slotMessage( const QCString&, const QByteArray& );
      void slotError(int );
       //  void slotCurrentTry( unsigned int ); */
       void slotDone(bool);
-      //void slotReceivedFile(const QString & );
+      void slotReceivedFile(const QString & );
       void slotSent();
+
   };
 };
 #endif