2 files changed, 8 insertions, 3 deletions

diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 6351c11..da552c3 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -36,2 +36,3 @@
 
+#include "kabprefs.h"
 #include <kdebug.h>
@@ -658,3 +659,2 @@ CardView::CardView(QWidget *parent, const char *name)
   connect( d->mTimer, SIGNAL(timeout()), this, SLOT(tryShowFullText()) );
-  connect( this, SIGNAL(executed(CardViewItem *)), this, SIGNAL( doubleClicked(CardViewItem *)) );
 
@@ -1249,3 +1249,3 @@ void CardView::contentsMouseReleaseEvent(QMouseEvent *e)
 
-  if (item && KGlobalSettings::singleClick())
+  if (item && KABPrefs::instance()->mHonorSingleClick)
   {
@@ -1266,3 +1266,3 @@ void CardView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 
-  if (item && !KGlobalSettings::singleClick())
+  if (item && !KABPrefs::instance()->mHonorSingleClick)
   {
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 7f33bb4..15f154e 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -244,2 +244,4 @@ void KAddressBookCardView::readConfig(KConfig *config)
   
+#if 0 
+  // LR KABPrefs::instance()->mHonorSingleClick is handled and fixed in cardviews contentsMouseDoubleClickEven
   disconnect(mCardView, SIGNAL(executed(CardViewItem *)),
@@ -253,3 +255,6 @@ void KAddressBookCardView::readConfig(KConfig *config)
             this, SLOT(addresseeExecuted(CardViewItem *)));
+#endif
   
+    connect(mCardView, SIGNAL(doubleClicked(CardViewItem *)),
+            this, SLOT(addresseeExecuted(CardViewItem *)));
 }