author | zautrix <zautrix> | 2004-10-15 14:26:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-15 14:26:07 (UTC) |
commit | 4f276d80bd977401d656851515474cc00c661e5b (patch) (unidiff) | |
tree | 0d3a747bef0431ef791b69876f5bda554f9ca83f /kabc | |
parent | c2fb960297c4b08980921c818a4d347057732390 (diff) | |
download | kdepimpi-4f276d80bd977401d656851515474cc00c661e5b.zip kdepimpi-4f276d80bd977401d656851515474cc00c661e5b.tar.gz kdepimpi-4f276d80bd977401d656851515474cc00c661e5b.tar.bz2 |
many phone and sync fixes
-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 | |||
@@ -310,6 +310,7 @@ void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false) | |||
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 | } |
diff --git a/kabc/kabc.pro b/kabc/kabc.pro index d690acc..17ebff8 100644 --- a/kabc/kabc.pro +++ b/kabc/kabc.pro | |||
@@ -48,7 +48,6 @@ formats/vcardformatplugin2.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 \ |
@@ -160,7 +159,6 @@ formatfactory.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 \ |