fix

3 files changed, 13 insertions, 2 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 18b4d58..39d14bb 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1495,7 +1495,8 @@ QString Addressee::realName() const
 
   if ( n.isEmpty() )
     n = name();
-
+  if ( n.isEmpty() )
+      n = organization();
   return n;
 }
 
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 2b40909..cce68b9 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -59,7 +59,7 @@ class AddresseeCardViewItem : public CardViewItem
                           bool showEmptyFields,
                           KABC::AddressBook *doc, const KABC::Addressee &a,
                           CardView *parent)
-      : CardViewItem(parent, a.formattedName()),
+      : CardViewItem(parent, a.realName() ),
         mFields( fields ), mShowEmptyFields(showEmptyFields),
         mDocument(doc), mAddressee(a)
       {
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index cf0d1ee..810c889 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -1298,6 +1298,16 @@ void KStandardDirs::addKDEDefaults()
            KConfig cfg (   confFile );
            cfg.setGroup("Global");
            localKdeDir = cfg.readEntry( "MICROKDEHOME", QDir::homeDirPath() + "/kdepim/" );
+#ifdef DESKTOP_VERSION           
+           if ( localKdeDir.startsWith( "LOCAL:" ) ) {
+#ifdef _WIN32_
+               localKdeDir = qApp->applicationDirPath () + "\\"+ localKdeDir.mid( 6 );
+#else
+               localKdeDir = qApp->applicationDirPath () + "/"+ localKdeDir.mid( 6 );
+#endif
+               qDebug("Using local conf dir %s ",localKdeDir.latin1() );
+           }
+#endif
        }
     }
     else