summaryrefslogtreecommitdiffabout
path: root/kabc
authorzautrix <zautrix>2005-07-02 12:29:31 (UTC)
committer zautrix <zautrix>2005-07-02 12:29:31 (UTC)
commit7b7c582bbb9908ec65c778b70baa6b2c2aa457fc (patch) (side-by-side diff)
treee1e1fb9e039f804d44317b5743ba5aae00fdcc9a /kabc
parent98273ae9af4d39181ace21fe3dfade141e5f8afb (diff)
downloadkdepimpi-7b7c582bbb9908ec65c778b70baa6b2c2aa457fc.zip
kdepimpi-7b7c582bbb9908ec65c778b70baa6b2c2aa457fc.tar.gz
kdepimpi-7b7c582bbb9908ec65c778b70baa6b2c2aa457fc.tar.bz2
Z 5500 fixes
Diffstat (limited to 'kabc') (more/less context) (show whitespace changes)
-rw-r--r--kabc/addresseeview.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 2691d9a..f3cfb23 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -234,12 +234,14 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
QString tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
if ( !tempX.isEmpty() ) {
+ if ( tempX == "male" || tempX == "female" ) {
notes += QString(
"<tr><td align=\"right\"><b>%1</b></td>"
"<td align=\"left\">%2</td></tr>" )
.arg( i18n( "" ) )
.arg( i18n(tempX) );
}
+ }
tempX = mAddressee.secrecy().asString();
@@ -327,6 +329,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" );
if ( !tempX.isEmpty() ) {
QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d");
+ if ( dt.isValid () ) {
tempX = KGlobal::locale()->formatDate(dt, true);
notes += QString(
"<tr><td align=\"right\"><b>%1</b></td>"
@@ -334,6 +337,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
.arg( i18n( "Anniversary" ) )
.arg( tempX );
}
+ }
tempX = mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" );
if ( !tempX.isEmpty() ) {
notes += QString(