2 files changed, 43 insertions, 7 deletions

diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 8f104e0..aa96210 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -259,13 +259,49 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
           if ( picAvailUrl ) {
               QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", QPixmap( picture.url() ));
           } else {
-              static bool setDefaultImage = false;
-              if ( !setDefaultImage ) {
-                  qDebug("Setting default pixmap ");
-                  QMimeSourceFactory::defaultFactory()->setPixmap( "defaultPenguin", KGlobal::iconLoader()->loadIcon( "package_toys", KIcon::Desktop, 128 ) );
-                  setDefaultImage = true;
+              if ( !mAddressee.custom( "KADDRESSBOOK", "X-Children" ).isEmpty() ) {
+                  static bool setDefaultImageChildren = false;
+                  if ( !setDefaultImageChildren ) {
+                      QMimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) );
+                      setDefaultImageChildren = true;
+                  }
+                  picString =  "<img src=\"familyIcon\" width=\"64\" height=\"64\">";
+                  
+              } else  if ( !mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ).isEmpty() ) {
+                  static bool setDefaultImagepouses = false;
+                  if ( !setDefaultImagepouses ) {
+                      QMimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) );
+                      setDefaultImagepouses = true;
+                  }
+                  picString =  "<img src=\"SpousesIcon\" width=\"64\" height=\"64\">";
+              } else {
+                  QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
+                  if ( gen == "male" ) {
+                      static bool setDefaultImageMale = false;
+                      if ( !setDefaultImageMale ) {
+                          QMimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) );
+                          setDefaultImageMale = true;
+                  }
+                      picString =  "<img src=\"MaleIcon\" width=\"64\" height=\"64\">";
+                      
+                  } else if ( gen == "female" ) {
+                  static bool setDefaultImageFemale = false;
+                  if ( !setDefaultImageFemale ) {
+                      QMimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) );
+                      setDefaultImageFemale = true;
+                  }
+                  picString =  "<img src=\"FemaleIcon\" width=\"64\" height=\"64\">";
+
+                  } else {
+                      static bool setDefaultImage = false;
+                      if ( !setDefaultImage ) {
+                          qDebug("Setting default pixmap ");
+                          QMimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) );
+                          setDefaultImage = true;
+                      }
+                      picString =  "<img src=\"defaultIcon\" width=\"64\" height=\"64\">";
+                  }
               }
-              picString =  "<img src=\"defaultPenguin\" width=\"64\" height=\"64\">";
           }
       }
     mText = QString::fromLatin1(
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index e1a490d..3650b20 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -313,7 +313,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
            SLOT( addressBookChanged() ) );
 
 #if 0
-  // LP moved to addressbook init method
+  // LR moved to addressbook init method
   mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization,
                                 "X-Department", "KADDRESSBOOK" );
   mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization,