3 files changed, 16 insertions, 5 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 21664de..b6472d7 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -3,11 +3,13 @@ Info about the changes in new versions of KDE-Pim/Pi
 ********** VERSION 2.1.10 ************
 
 KO/Pi:
 Importing Birthdays will now create another file resource "Birthdays" and import the birthday data from KA/Pi into that file.
+When a multidayevent is selected in monthview all occurences of this event in the monthview are now hightlighted.
 
 KA/Pi:
 Fixed two problems in csv export.
+Fixed problems when calling the contact selection dialog from KO/Pi or OM/Pi.
 
 ********** VERSION 2.1.9 ************
 
 KO/Pi:
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 9197850..0cf75a0 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -62,8 +62,9 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   KDialogBase( KDialogBase::Plain, i18n("Select Addressee"),
                Ok|Cancel, No, parent ), mMultiple( multiple )
 {
     qDebug("NEW AddresseeDialog ");
+    
   QWidget *topWidget = plainPage();
 
   QBoxLayout *topLayout = new QHBoxLayout( topWidget );
 
@@ -323,10 +324,13 @@ Addressee AddresseeDialog::getAddressee( QWidget *parent )
 }
 
 Addressee::List AddresseeDialog::getAddressees( QWidget *parent )
 {
-    AddresseeDialog *dlg = new AddresseeDialog( parent, true );
     Addressee::List addressees;
+    static bool running = false;
+    if ( running ) return addressees;
+    running = true;
+    AddresseeDialog *dlg = new AddresseeDialog( parent, true );
     static int geoX = 0;
     static int geoY = 0;
     static int geoW = 0;
     static int geoH = 0;
@@ -353,8 +357,9 @@ Addressee::List AddresseeDialog::getAddressees( QWidget *parent )
         addressees =  dlg->addressees();
     }
 
     delete dlg;
+    running = false;
     return addressees;
 }
 
 void AddresseeDialog::addressBookChanged()
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index b107e2d..3715786 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2543,13 +2543,14 @@ void KABCore::configureResources()
  * for the attendees list of an event.
  */
 void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid)
 {
-
+    qDebug("KABCore::requestForNameEmailUidList ");
   bool ok = false;
   mEmailSourceChannel = sourceChannel;
   mEmailSourceUID = uid; 
-  callContactdialog();
+  QTimer::singleShot( 10,this, SLOT ( callContactdialog() ) );
+    //callContactdialog();
 #if 0
   int wid = uid.toInt( &ok );
   qDebug("UID %s ", uid.latin1());
   if ( ok ) {
@@ -2575,13 +2576,16 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
 }
 void KABCore::resizeAndCallContactdialog()
 {
     updateMainWindow();
-    QTimer::singleShot( 100,this, SLOT ( callContactdialog() ) );
+    QTimer::singleShot( 10,this, SLOT ( callContactdialog() ) );
 }
 
 void KABCore::callContactdialog()
 {
+    static bool running = false;
+    if (running) return;
+    running = true;
     QStringList nameList;
   QStringList emailList;
   QStringList uidList; 
   qDebug(" KABCore::callContactdialog:DESKTOP WIDTH %d ",   QApplication::desktop()->width()       );
@@ -2595,9 +2599,9 @@ void KABCore::callContactdialog()
   }
   QString uid = mEmailSourceUID;
   //qDebug("%s %s ", sourceChannel.latin1(), uid.latin1());
   bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(mEmailSourceChannel, uid, nameList, emailList, uidList);
-
+  running = false;
 }
 /* this method will be called through the QCop interface from Ko/Pi to select birthdays
  * to put them into the calendar.
  */