fix

1 files changed, 19 insertions, 0 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 82b4b9b..bfcfab5 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -335,8 +335,27 @@ void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
             // if ( isSubSet && ! found ) 
             if (  ! found ) // LR try this one...
                 mData->phoneNumbers.append( *phoneItAD );                
         }
+    } else {
+        PhoneNumber::List phoneAD = ad.phoneNumbers();
+        PhoneNumber::List::Iterator phoneItAD;
+        for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) {
+            bool found = false;
+            PhoneNumber::List::Iterator it;
+            for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
+                if ( ( *phoneItAD ).contains( (*it)  ) ) {
+                    found = true;
+                    (*it).setType( ( *phoneItAD ).type() );
+                    (*it).setNumber( ( *phoneItAD ).number() );
+                    break;
+                }
+            }
+            if (  ! found ) { // append numbers which do not have work or home type
+                if ( ! ( ( *phoneItAD ).type() &  (PhoneNumber::Work | PhoneNumber::Home) ) )
+                    mData->phoneNumbers.append( *phoneItAD );   
+            }             
+        }
     }
     if ( isSubSet ) {
         // ************* emails;
         t = mData->emails;