fixes

3 files changed, 17 insertions, 6 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
@@ -6,2 +6,3 @@ 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.
 
@@ -9,2 +10,3 @@ KA/Pi:
 Fixed two problems in csv export.
+Fixed problems when calling the contact selection dialog from KO/Pi or OM/Pi.
 
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 9197850..0cf75a0 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -65,2 +65,3 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
     qDebug("NEW AddresseeDialog ");
+    
   QWidget *topWidget = plainPage();
@@ -326,4 +327,7 @@ 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;
@@ -356,2 +360,3 @@ Addressee::List AddresseeDialog::getAddressees( QWidget *parent )
     delete dlg;
+    running = false;
     return addressees;
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index b107e2d..3715786 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2546,3 +2546,3 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
 {
-
+    qDebug("KABCore::requestForNameEmailUidList ");
   bool ok = false;
@@ -2550,3 +2550,4 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
   mEmailSourceUID = uid; 
-  callContactdialog();
+  QTimer::singleShot( 10,this, SLOT ( callContactdialog() ) );
+    //callContactdialog();
 #if 0
@@ -2578,3 +2579,3 @@ void KABCore::resizeAndCallContactdialog()
     updateMainWindow();
-    QTimer::singleShot( 100,this, SLOT ( callContactdialog() ) );
+    QTimer::singleShot( 10,this, SLOT ( callContactdialog() ) );
 }
@@ -2583,3 +2584,6 @@ void KABCore::callContactdialog()
 {
-    QStringList nameList;
+    static bool running = false;
+    if (running) return;
+    running = true;
+  QStringList nameList;
   QStringList emailList;
@@ -2598,3 +2602,3 @@ void KABCore::callContactdialog()
   bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(mEmailSourceChannel, uid, nameList, emailList, uidList);
-
+  running = false;
 }