[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-pim
Subject:    Re: [Kde-pim] missed comparirsons  in AddresseeDiffAlgo
From:       Mario Teijeiro Otero <emeteo () escomposlinux ! org>
Date:       2004-11-04 19:19:55
Message-ID: 200411042020.02056.emeteo () escomposlinux ! org
[Download RAW message or body]

[Attachment #2 (multipart/signed)]

[Attachment #4 (multipart/mixed)]


El Thursday 04 November 2004 19:07, Tobias Koenig escribió:
> Hi Mario,
> I didn't find the time to add it, but that should be done of course.
>
> >  Can I to add this comparisons and commited?, Will I broke something?
>
> Could you send a patch to kde-pim first, please?

Of course, is attached.

I attach  other patch, to support formatedName in addressbookmerger. 
Is ok that in KABC::Addressee::addresseoperator==(addressee,addressee) compare 
for formatedName ? I think no, because for formatedNames is only the 
representation of givenName and familyName, not the data inself.

Regards

["addresseediffalgo.diff" (text/x-diff)]

Index: addresseediffalgo.cpp
===================================================================
RCS file: /home/kde/kdepim/libkdepim/addresseediffalgo.cpp,v
retrieving revision 1.2
diff -b -u -3 -p -r1.2 addresseediffalgo.cpp
--- addresseediffalgo.cpp	13 Jul 2004 16:02:27 -0000	1.2
+++ addresseediffalgo.cpp	4 Nov 2004 19:13:43 -0000
@@ -102,6 +102,9 @@ void AddresseeDiffAlgo::run()
   if ( mLeftAddressee.secrecy() != mRightAddressee.secrecy() ) {
     conflictField( KABC::Addressee::secrecyLabel(), \
mLeftAddressee.secrecy().asString(), mRightAddressee.secrecy().asString() );  }
+  if ( mLeftAddressee.url()!= mRightAddressee.url() )
+    conflictField( KABC::Addressee::urlLabel(), mLeftAddressee.url().prettyURL(),
+      emRightAddressee.url().prettyURL() );
 
   if ( mLeftAddressee.logo() != mRightAddressee.logo() ) {
   }
@@ -109,6 +112,8 @@ void AddresseeDiffAlgo::run()
   if ( mLeftAddressee.photo() != mRightAddressee.photo() ) {
   }
 
+  diffList( "emails", mLeftAddressee.emails(), mRightAddressee.emails() );
+
   diffList( "Phone Numbers", mLeftAddressee.phoneNumbers(), \
mRightAddressee.phoneNumbers() );  diffList( "Addresses", mLeftAddressee.addresses(), \
mRightAddressee.addresses() );  


["addressbookmerger.diff" (text/x-diff)]

Index: addressbookmerger.h
===================================================================
RCS file: /home/kde/kdepim/kitchensync/libksync/addressbookmerger.h,v
retrieving revision 1.1
diff -b -u -3 -p -r1.1 addressbookmerger.h
--- addressbookmerger.h	13 Aug 2004 23:27:20 -0000	1.1
+++ addressbookmerger.h	4 Nov 2004 19:15:16 -0000
@@ -32,6 +32,7 @@ public:
       FamilyName,
       GivenName,
       AdditionalName,
+      FormattedName,
       Prefix,
       Suffix,
       NickName,

[Attachment #9 (application/pgp-signature)]

_______________________________________________
kde-pim mailing list
kde-pim@kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
kde-pim home page at http://pim.kde.org/

[prev in list] [next in list] [prev in thread] [next in thread]