author | zautrix <zautrix> | 2005-10-29 16:39:40 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-10-29 16:39:40 (UTC) |
commit | 898dbabef6d747447999add46201315d04f85f63 (patch) (unidiff) | |
tree | fb247cbbd99ca6918400547e16484a58a8ba1523 /kabc/addresseeview.cpp | |
parent | 1360f8e3b5da58b561f868643d2d5f04b874cee7 (diff) | |
download | kdepimpi-898dbabef6d747447999add46201315d04f85f63.zip kdepimpi-898dbabef6d747447999add46201315d04f85f63.tar.gz kdepimpi-898dbabef6d747447999add46201315d04f85f63.tar.bz2 |
commit
-rw-r--r-- | kabc/addresseeview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index aae923c..5c24acf 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp | |||
@@ -137,13 +137,15 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) | |||
137 | #if 0 | 137 | #if 0 |
138 | QString name = ( mAddressee.assembledName().isEmpty() ? | 138 | QString name = ( mAddressee.assembledName().isEmpty() ? |
139 | mAddressee.formattedName() : mAddressee.assembledName() ); | 139 | mAddressee.formattedName() : mAddressee.assembledName() ); |
140 | #endif | 140 | #endif |
141 | 141 | ||
142 | QString name = mAddressee.realName(); | 142 | QString name = mAddressee.realName(); |
143 | 143 | QString assName = mAddressee.assembledName(); | |
144 | if ( assName.isEmpty() ) | ||
145 | assName = name; | ||
144 | QString dynamicPart; | 146 | QString dynamicPart; |
145 | 147 | ||
146 | dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(),true ); | 148 | dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(),true ); |
147 | QStringList emails = mAddressee.emails(); | 149 | QStringList emails = mAddressee.emails(); |
148 | QStringList::ConstIterator emailIt; | 150 | QStringList::ConstIterator emailIt; |
149 | QString type = i18n( "Email" ); | 151 | QString type = i18n( "Email" ); |
@@ -151,13 +153,13 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) | |||
151 | if ( emailIt != emails.end() ) { | 153 | if ( emailIt != emails.end() ) { |
152 | if ( kemailAvail ) { | 154 | if ( kemailAvail ) { |
153 | dynamicPart += QString( | 155 | dynamicPart += QString( |
154 | "<tr><td align=\"right\"><b>%1</b></td>" | 156 | "<tr><td align=\"right\"><b>%1</b></td>" |
155 | "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" ) | 157 | "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" ) |
156 | .arg( type ) | 158 | .arg( type ) |
157 | .arg( name ) | 159 | .arg( assName ) |
158 | .arg( *emailIt ) | 160 | .arg( *emailIt ) |
159 | .arg( *emailIt ); | 161 | .arg( *emailIt ); |
160 | ++emailIt; | 162 | ++emailIt; |
161 | } else { | 163 | } else { |
162 | dynamicPart += QString( | 164 | dynamicPart += QString( |
163 | "<tr><td align=\"right\"><b>%1</b></td>" | 165 | "<tr><td align=\"right\"><b>%1</b></td>" |