6 files changed, 68 insertions, 21 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index c61b387..47d298a 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -429,3 +429,3 @@ Addressee::List AddressBook::findByName( const QString &name )
   for ( it = begin(); it != end(); ++it ) {
-    if ( name == (*it).name() ) {
+    if ( name == (*it).realName() ) {
       results.append( *it );
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 760820e..9f38f08 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -65,4 +65,7 @@ StdAddressBook *StdAddressBook::self()
       QString appdir = StdAddressBook::setTempAppDir();
-
-  kdDebug(5700) << "StdAddressBook::self()" << endl;
+      qDebug("****************************************************** ");
+      qDebug("****************************************************** ");
+      qDebug("****************************************************** ");
+      qDebug("****************************************************** ");
+      qDebug("****************************************************** ");
 // US im am not sure why I have to use the other format here??
@@ -102,2 +105,9 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources )
   {
+      qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ ");
+      qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ ");
+      qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ ");
+      qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ ");
+      qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ ");
+      qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ ");
+      qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ ");
       QString appdir =StdAddressBook::setTempAppDir();
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 4299ebd..2f9f1df 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2043,3 +2043,3 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses
 {
-//  qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1());
+    //qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1());
 
@@ -2057,8 +2057,9 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses
       emaillist = mAddressBook->findByEmail( email );
-
+    qDebug("count %d %d ",  namelist.count(),emaillist.count() );
     //check if we have a match in Namelist and Emaillist
-    if ((namelist.count() == 0) && (emaillist.count() > 0))
-      foundUid == emaillist[0].uid();
+    if ((namelist.count() == 0) && (emaillist.count() > 0)) {
+      foundUid = emaillist[0].uid();
+    }
     else if ((namelist.count() > 0) && (emaillist.count() == 0))
-      foundUid == namelist[0].uid();
+      foundUid = namelist[0].uid();
     else
@@ -2071,3 +2072,3 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses
           {
-            foundUid == namelist[i].uid();
+            foundUid = namelist[i].uid();
           }
@@ -2084,2 +2085,3 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses
   {
+   
     // raise Ka/Pi if it is in the background
@@ -2087,7 +2089,8 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses
 #ifndef KORG_NODCOP
-   QCopEnvelope e("QPE/Application/kapi", "raise()");
+      //QCopEnvelope e("QPE/Application/kapi", "raise()");
 #endif
 #endif
-
+    
     mMainWindow->showMaximized();
+    mMainWindow-> raise();
 
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 1f69700..0866939 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -52,5 +52,9 @@
 #endif
-#ifndef DESKTOP_VERSION
+
+#ifdef DESKTOP_VERSION
+#include <kabc/addresseedialog.h>
+#else //DESKTOP_VERSION
+#include <externalapphandler.h>
 #include <qtopia/qcopenvelope_qws.h> 
-#endif
+#endif //DESKTOP_VERSION
 
@@ -70,3 +74,5 @@ void KOEventViewer::setSource(const QString& n)
 
-    if ( n.left(3) == "uid" ) {
+    if ( n.left(3) == "uid" ) 
+#ifdef DESKTOP_VERSION
+        {
         KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
@@ -75,7 +81,4 @@ void KOEventViewer::setSource(const QString& n)
             // LR I do not understand, why the uid string is different on zaurus and desktop
-#ifdef DESKTOP_VERSION
             QString uid = "uid://"+(*it).uid();
-#else
-            QString uid = "uid:"+(*it).uid();
-#endif
+
             //qDebug("for *%s*          +%s+ ", n.latin1(), uid.latin1());
@@ -101,2 +104,20 @@ void KOEventViewer::setSource(const QString& n)
     }
+#else  
+    {
+        QPtrList<Attendee> attendees = mCurrentIncidence->attendees();
+        if (attendees.count()) {  
+            Attendee *a;
+            for(a=attendees.first();a;a=attendees.next()) {
+                if ( "uid:"+a->uid() == n ) {
+                    bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI(a->name(), a->email(), "");
+                    return;
+                }
+            }
+        }
+        return;
+    }
+    //requestNameEmailUidListFromKAPI("QPE/Application/kopi", this->name() /* name is here the unique uid*/);
+  // the result should now arrive through method insertAttendees
+    //QString uid = "uid:"+(*it).uid();
+#endif
     if ( n.left(6) == "mailto" ) {
@@ -104,3 +125,3 @@ void KOEventViewer::setSource(const QString& n)
 #ifndef DESKTOP_VERSION
-        QCopEnvelope e("QPE/Application/kmpi", "newMail(QString)" );
+        QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" );
         e << n.mid(7);
@@ -385,2 +406,3 @@ void KOEventViewer::formatAttendees(Incidence *event)
        
+#ifdef DESKTOP_VERSION
         KABC::AddressBook *add_book = KABC::StdAddressBook::self();
@@ -396,2 +418,7 @@ void KOEventViewer::formatAttendees(Incidence *event)
         }
+#else //DESKTOP_VERSION
+            mText.append(event->organizer());
+#endif //DESKTOP_VERSION
+
+
 #else
@@ -412,2 +439,3 @@ void KOEventViewer::formatAttendees(Incidence *event)
 #ifndef KORG_NOKABC
+#ifdef DESKTOP_VERSION
             if (a->name().isEmpty()) {
@@ -430,2 +458,8 @@ void KOEventViewer::formatAttendees(Incidence *event)
             }
+#else //DESKTOP_VERSION
+                mText += "<li><a href=\"uid:" + a->uid() + "\">";
+                if (!a->name().isEmpty()) mText += a->name();
+                else mText += a->email();
+                mText += "</a>\n";
+#endif //DESKTOP_VERSION
 #else
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index d4fadcb..7978b46 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -204,3 +204,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
   //US listen for result adressed from Ka/Pi
+#ifndef DESKTOP_VERSION
   connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
+#endif
 }
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index bd83626..6100097 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -308,3 +308,2 @@ bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& d
       stream >> uid >> list1 >> list2 >> list3;
-
       emit receivedMessageFromTarget(uid, list1, list2, list3);
@@ -972,3 +971,2 @@ void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& dat
   bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data );
-
   if (!res)