From 4f276d80bd977401d656851515474cc00c661e5b Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 15 Oct 2004 14:26:07 +0000
Subject: many phone and sync fixes

---
(limited to 'kabc')

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)
             if ( ( *phoneItAD ).contains( (*it)  ) ) {
                 found = true;
                 (*it).setType( ( *phoneItAD ).type() );
+                (*it).setNumber( ( *phoneItAD ).number() );
                 break;
             }
         }
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 \
  secrecy.h \
  sound.h \
  addressbook.h \
- syncprefwidget.h \
  timezone.h \
  tmpaddressbook.h \
  addressee.h \
@@ -160,7 +159,6 @@ formatfactory.cpp \
  secrecy.cpp \
  sound.cpp \
  addressbook.cpp \
- syncprefwidget.cpp \
  timezone.cpp \
  tmpaddressbook.cpp \
  addressee.cpp \
--
cgit v0.9.0.2