-rw-r--r-- | kabc/addressee.cpp | 1 | ||||
-rw-r--r-- | kabc/kabc.pro | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 2564894..40877ef 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -309,8 +309,9 @@ void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false) | |||
309 | for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { | 309 | for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { |
310 | if ( ( *phoneItAD ).contains( (*it) ) ) { | 310 | if ( ( *phoneItAD ).contains( (*it) ) ) { |
311 | found = true; | 311 | found = true; |
312 | (*it).setType( ( *phoneItAD ).type() ); | 312 | (*it).setType( ( *phoneItAD ).type() ); |
313 | (*it).setNumber( ( *phoneItAD ).number() ); | ||
313 | break; | 314 | break; |
314 | } | 315 | } |
315 | } | 316 | } |
316 | if ( isSubSet && ! found ) | 317 | if ( isSubSet && ! found ) |
diff --git a/kabc/kabc.pro b/kabc/kabc.pro index d690acc..17ebff8 100644 --- a/kabc/kabc.pro +++ b/kabc/kabc.pro | |||
@@ -47,9 +47,8 @@ formats/vcardformatplugin2.h \ | |||
47 | picture.h \ | 47 | picture.h \ |
48 | secrecy.h \ | 48 | secrecy.h \ |
49 | sound.h \ | 49 | sound.h \ |
50 | addressbook.h \ | 50 | addressbook.h \ |
51 | syncprefwidget.h \ | ||
52 | timezone.h \ | 51 | timezone.h \ |
53 | tmpaddressbook.h \ | 52 | tmpaddressbook.h \ |
54 | addressee.h \ | 53 | addressee.h \ |
55 | addresseedialog.h \ | 54 | addresseedialog.h \ |
@@ -159,9 +158,8 @@ formatfactory.cpp \ | |||
159 | picture.cpp \ | 158 | picture.cpp \ |
160 | secrecy.cpp \ | 159 | secrecy.cpp \ |
161 | sound.cpp \ | 160 | sound.cpp \ |
162 | addressbook.cpp \ | 161 | addressbook.cpp \ |
163 | syncprefwidget.cpp \ | ||
164 | timezone.cpp \ | 162 | timezone.cpp \ |
165 | tmpaddressbook.cpp \ | 163 | tmpaddressbook.cpp \ |
166 | addressee.cpp \ | 164 | addressee.cpp \ |
167 | addresseelist.cpp \ | 165 | addresseelist.cpp \ |