Hello community,
here is the log from the commit of package kdepim3 for openSUSE:Factory
checked in at Thu Sep 15 14:21:03 CEST 2011.
--------
New Changes file:
--- /dev/null 2010-08-26 16:28:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepim3/kdepim3.changes 2011-09-09 10:26:40.000000000 +0200
@@ -0,0 +1,1832 @@
+-------------------------------------------------------------------
+Fri Sep 9 08:23:19 UTC 2011 - anixx@opensuse.org
+
+- correct licenses information (bnc#716682)
+
+-------------------------------------------------------------------
+Mon Jun 22 07:09:46 CEST 2009 - beineri@opensuse.org
+
+- remove ancient unversionized obsolete (akregator)
+
+-------------------------------------------------------------------
+Wed Apr 8 19:27:37 CEST 2009 - wstephenson@suse.de
+
+- Add fix for kmail attachment security hole (bnc#490696)
+
+-------------------------------------------------------------------
+Mon Nov 17 18:05:51 CET 2008 - dmueller@suse.de
+
+- remove test for sles_version
+
+-------------------------------------------------------------------
+Wed Sep 24 21:30:04 CEST 2008 - wstephenson@suse.de
+
+- Fix vcard encoding issue (bnc#382959)
+
+-------------------------------------------------------------------
+Tue Sep 9 12:34:27 CEST 2008 - dmueller@suse.de
+
+- 3_5_BRANCH.diff update: fixes build against newer glibc
+
+-------------------------------------------------------------------
+Wed Aug 20 18:39:57 CEST 2008 - coolo@suse.de
+
+- update to KDE 3.5.10
+ * translation update, desktop files validate
+ * removed patches upstreamed
+
+-------------------------------------------------------------------
+Thu Jul 24 17:09:15 CET 2008 - wstephenson@suse.de
+
+- Fix IMAP groupware functionality (bnc#398285)
+
+-------------------------------------------------------------------
+Wed May 14 10:03:30 CEST 2008 - stbinner@suse.de
+
+- split off libkmime2 and libkmime-devel (bnc#390084)
+
+-------------------------------------------------------------------
+Fri May 9 10:45:47 CEST 2008 - dmueller@suse.de
+
+- 3_5_BRANCH.diff update:
+ * fix recurrence count loss in kalarm
+ * fix missing notification mails in korganizer
+ * fix RFC2047 decoding in email address normalisation (Kmail/kontact)
+ * translation update
+
+-------------------------------------------------------------------
+Fri Apr 11 19:44:16 CEST 2008 - stbinner@suse.de
+
+- add missing depedency of kdepim3-devel on libkcal-devel
+
+-------------------------------------------------------------------
+Thu Apr 10 19:09:38 CEST 2008 - stbinner@suse.de
+
+- split off libkcal and libktnef (bnc#377524)
+
+-------------------------------------------------------------------
+Fri Apr 4 23:36:58 CEST 2008 - dmueller@suse.de
+
+- branch diff update
+
+-------------------------------------------------------------------
+Thu Mar 20 13:09:05 CET 2008 - wstephenson@suse.de
+
+- Disable new style distribution lists, they are only good for
+ Kolab users without a converter.
+
+-------------------------------------------------------------------
+Mon Mar 10 16:39:42 CET 2008 - wstephenson@suse.de
+
+- Update 3_5_BRANCH
+ * Fix KMail corrupting outgoing binary attachments
+
+-------------------------------------------------------------------
+Fri Mar 7 16:39:42 CET 2008 - wstephenson@suse.de
+
+- Update 3_5_BRANCH
+ * Fix KMail sieve support with older Cyrus servers
+
+-------------------------------------------------------------------
+Fri Feb 29 13:20:49 CET 2008 - stbinner@suse.de
+
+- fix version requirement
+
+-------------------------------------------------------------------
+Thu Feb 21 21:53:11 CET 2008 - dmueller@suse.de
+
+- fix gnokii detection
+
+-------------------------------------------------------------------
+Mon Feb 18 12:05:56 CET 2008 - coolo@suse.de
+
+- update 3_5_BRANCH
+ * one of our patches went into SVN
+ * fix kmail imap4 crashes
+
+-------------------------------------------------------------------
+Wed Feb 13 23:42:55 CET 2008 - dmueller@suse.de
+
+- update to 3.5.9
+ * kmail enterprise is merged back upstream
+ * bugfixes, translation updates
+ * http://kde.org/announcements/changelogs/changelog3_5_8to3_5_9.php
+
+-------------------------------------------------------------------
+Fri Feb 8 14:40:52 CET 2008 - stbinner@suse.de
+
+- don't require complete kdebase3 package
+
+-------------------------------------------------------------------
+Tue Jan 15 18:33:40 CET 2008 - wstephenson@suse.de
+
+- Update enterprise branch snapshot
+ - New event/todo editor
+
+-------------------------------------------------------------------
+Mon Dec 17 11:29:38 CET 2007 - stbinner@suse.de
+
+- brand Akregator user-agent string
+
+-------------------------------------------------------------------
+Thu Nov 22 15:17:06 CET 2007 - dmueller@suse.de
+
+- rename libknodecommon to not clash with KDE4
+
+-------------------------------------------------------------------
+Sat Oct 20 17:38:17 CEST 2007 - coolo@suse.de
+
+- compile with gcc 4.3
+
+-------------------------------------------------------------------
+Mon Sep 17 18:02:51 CEST 2007 - dmueller@suse.de
+
+- fix crash on kontact startup (#309425)
+- fix online queries on each message send (kde 132938)
+
+-------------------------------------------------------------------
+Tue Sep 11 23:46:18 CEST 2007 - dmueller@suse.de
+
+- fix message status flags being lost in kmail with imap
+- fix duplicated text in dialogs (#309321)
+- fix favourite view (#309072)
+- fix account fetches getting lost (#309663)
+
+-------------------------------------------------------------------
+Tue Sep 4 12:00:20 CEST 2007 - dmueller@suse.de
+
+- fix various bugs regressions around POP3 (#307040 and others)
+
+-------------------------------------------------------------------
+Tue Sep 4 00:32:52 CEST 2007 - dmueller@suse.de
+
+- fix parallel build
+
+-------------------------------------------------------------------
+Sun Sep 2 13:25:23 CEST 2007 - dgollub@suse.de
+
+- added missing xml conflict algorithm (#304803)
+
+-------------------------------------------------------------------
+Fri Aug 31 19:08:41 CEST 2007 - wstephenson@suse.de
+
+- Update package version number
+
+-------------------------------------------------------------------
+Fri Aug 31 15:52:54 CEST 2007 - wstephenson@suse.de
+
+- Fix crash on pasting into mail composer
+ (#302067)
+- Fix crashes around POP fetching
+
+-------------------------------------------------------------------
+Wed Aug 29 12:13:44 CEST 2007 - wstephenson@suse.de
+
+- Update enterprise branch diff to fix
+ - #305828 KMail crash retrieving mail
+
+-------------------------------------------------------------------
+Thu Aug 23 18:42:26 CEST 2007 - dmueller@suse.de
+
+- fix dialog sizes (#301677)
+
+-------------------------------------------------------------------
+Thu Aug 23 14:58:19 CEST 2007 - cstender@suse.de
+
+- fixed wrong kitchensync defaults (#303656)
+
++++ 1635 more lines (skipped)
++++ between /dev/null
++++ and /mounts/work_src_done/STABLE/kdepim3/kdepim3.changes
calling whatdependson for head-i586
New:
----
3_5_BRANCH.diff
akregator-useragent.diff
bug-382959_kdepim_fix_vcardparser.patch
fix-artwork.diff
fix_designer_path.diff
groupwarewizard.desktop
install-headers.diff
kdepim-3.5.10.tar.bz2
kdepim3.changes
kdepim3.spec
kdepim_networkstatus_branch.diff
kitchensync-defaults.diff
kitchensync-opensuse.diff
kitchensync-xmldiffalgo.diff
kmail-crash.diff
kmail_allow_tls_login_auth.diff
knode_threaded_crash.diff
no-final.diff
no-libintl.diff
r951202.diff
start-kpilot-instead-complain.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim3.spec ++++++
++++ 981 lines (skipped)
++++++ 3_5_BRANCH.diff ++++++
++++ 655 lines (skipped)
++++++ akregator-useragent.diff ++++++
Index: akregator/src/akregator_part.cpp
===================================================================
--- akregator/src/akregator_part.cpp (revision 749548)
+++ akregator/src/akregator_part.cpp (working copy)
@@ -232,7 +232,7 @@
initFonts();
- RSS::FileRetriever::setUserAgent(QString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION));
+ RSS::FileRetriever::setUserAgent(QString("Akregator/%1; librss/remnants SUSE").arg(AKREGATOR_VERSION));
}
void Part::loadPlugins()
++++++ bug-382959_kdepim_fix_vcardparser.patch ++++++
Index: kaddressbook/xxportmanager.cpp
===================================================================
--- kaddressbook/xxportmanager.cpp (Revision 861925)
+++ kaddressbook/xxportmanager.cpp (Arbeitskopie)
@@ -39,7 +39,7 @@
#include "xxportmanager.h"
KURL XXPortManager::importURL = KURL();
-QString XXPortManager::importData = QString::null;
+QCString XXPortManager::importData = QCString();
XXPortManager::XXPortManager( KAB::Core *core, QObject *parent, const char *name )
: QObject( parent, name ), mCore( core )
@@ -66,11 +66,11 @@
importURL = KURL();
}
-void XXPortManager::importVCardFromData( const QString &vCard )
+void XXPortManager::importVCardFromData( const QCString &vCard )
{
importData = vCard;
slotImport( "vcard", "<empty>" );
- importData = "";
+ importData = QCString();
}
void XXPortManager::slotImport( const QString &identifier, const QString &data )
Index: kaddressbook/interfaces/core.h
===================================================================
--- kaddressbook/interfaces/core.h (Revision 861925)
+++ kaddressbook/interfaces/core.h (Arbeitskopie)
@@ -166,7 +166,7 @@
/**
DCOP METHOD: Imports the given vCard.
*/
- virtual void importVCardFromData( const QString& vCard ) = 0;
+ virtual void importVCardFromData( const QCString& vCard ) = 0;
/**
DCOP METHOD: Opens contact editor to input a new contact.
Index: kaddressbook/kaddressbook_part.h
===================================================================
--- kaddressbook/kaddressbook_part.h (Revision 861925)
+++ kaddressbook/kaddressbook_part.h (Arbeitskopie)
@@ -50,7 +50,7 @@
public slots:
virtual void addEmail( QString addr );
virtual void importVCard( const KURL& url );
- virtual void importVCardFromData( const QString& vCard );
+ virtual void importVCardFromData( const QCString& vCard );
virtual ASYNC showContactEditor( QString uid );
virtual void newContact();
virtual void newDistributionList();
Index: kaddressbook/kaddressbookmain.h
===================================================================
--- kaddressbook/kaddressbookmain.h (Revision 861925)
+++ kaddressbook/kaddressbookmain.h (Arbeitskopie)
@@ -53,7 +53,7 @@
public slots:
virtual void addEmail( QString addr );
virtual void importVCard( const KURL& url );
- virtual void importVCardFromData( const QString& vCard );
+ virtual void importVCardFromData( const QCString& vCard );
virtual ASYNC showContactEditor( QString uid );
virtual void newContact();
virtual void newDistributionList();
Index: kaddressbook/kaddressbook_part.cpp
===================================================================
--- kaddressbook/kaddressbook_part.cpp (Revision 861925)
+++ kaddressbook/kaddressbook_part.cpp (Arbeitskopie)
@@ -92,7 +92,7 @@
mCore->importVCard( url );
}
-void KAddressbookPart::importVCardFromData( const QString& vCard )
+void KAddressbookPart::importVCardFromData( const QCString& vCard )
{
mCore->importVCardFromData( vCard );
}
Index: kaddressbook/xxport/vcard_xxport.h
===================================================================
--- kaddressbook/xxport/vcard_xxport.h (Revision 861925)
+++ kaddressbook/xxport/vcard_xxport.h (Arbeitskopie)
@@ -40,8 +40,8 @@
KABC::AddresseeList importContacts( const QString &data ) const;
private:
- KABC::AddresseeList parseVCard( const QString &data ) const;
- bool doExport( const KURL &url, const QString &data );
+ KABC::AddresseeList parseVCard( const QCString &data ) const;
+ bool doExport( const KURL &url, const QCString &data );
void addKey( KABC::Addressee &addr, KABC::Key::Types type );
KABC::AddresseeList filterContacts( const KABC::AddresseeList& );
Index: kaddressbook/xxport/vcard_xxport.cpp
===================================================================
--- kaddressbook/xxport/vcard_xxport.cpp (Revision 861925)
+++ kaddressbook/xxport/vcard_xxport.cpp (Arbeitskopie)
@@ -118,9 +118,9 @@
return true;
if ( data == "v21" )
- ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v2_1 ) );
+ ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v2_1 ) );
else
- ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v3_0 ) );
+ ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v3_0 ) );
} else {
QString msg = i18n( "You have selected a list of contacts, shall they be "
"exported to several files?" );
@@ -151,9 +151,9 @@
tmpList.append( *it );
if ( data == "v21" )
- tmpOk = doExport( url, converter.createVCards( tmpList, KABC::VCardConverter::v2_1 ) );
+ tmpOk = doExport( url, converter.createVCardsRaw( tmpList, KABC::VCardConverter::v2_1 ) );
else
- tmpOk = doExport( url, converter.createVCards( tmpList, KABC::VCardConverter::v3_0 ) );
+ tmpOk = doExport( url, converter.createVCardsRaw( tmpList, KABC::VCardConverter::v3_0 ) );
ok = ok && tmpOk;
}
@@ -166,9 +166,9 @@
return true;
if ( data == "v21" )
- ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v2_1 ) );
+ ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v2_1 ) );
else
- ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v3_0 ) );
+ ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v3_0 ) );
}
}
}
@@ -206,7 +206,7 @@
QByteArray rawData = file.readAll();
file.close();
if ( rawData.size() > 0 )
- addrList += parseVCard( rawData );
+ addrList += parseVCard( QCString( rawData.data(), rawData.size() ) );
KIO::NetAccess::removeTempFile( fileName );
} else {
@@ -243,22 +243,19 @@
return addrList;
}
-KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
+KABC::AddresseeList VCardXXPort::parseVCard( const QCString &data ) const
{
KABC::VCardConverter converter;
- return converter.parseVCards( data );
+ return converter.parseVCardsRaw( data );
}
-bool VCardXXPort::doExport( const KURL &url, const QString &data )
+bool VCardXXPort::doExport( const KURL &url, const QCString &data )
{
KTempFile tmpFile;
tmpFile.setAutoDelete( true );
- QTextStream stream( tmpFile.file() );
- stream.setEncoding( QTextStream::UnicodeUTF8 );
-
- stream << data;
+ tmpFile.file()->writeBlock( data, data.length() );
tmpFile.close();
return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
Index: kaddressbook/kaddressbookservice.cpp
===================================================================
--- kaddressbook/kaddressbookservice.cpp (Revision 861925)
+++ kaddressbook/kaddressbookservice.cpp (Arbeitskopie)
@@ -30,7 +30,7 @@
{
}
-void KAddressBookService::importVCardFromData( const QString& vCard )
+void KAddressBookService::importVCardFromData( const QCString& vCard )
{
mCore->importVCardFromData( vCard );
}
Index: kaddressbook/kabcore.cpp
===================================================================
--- kaddressbook/kabcore.cpp (Revision 861925)
+++ kaddressbook/kabcore.cpp (Arbeitskopie)
@@ -747,7 +747,7 @@
mXXPortManager->importVCard( url );
}
-void KABCore::importVCardFromData( const QString &vCard )
+void KABCore::importVCardFromData( const QCString &vCard )
{
mXXPortManager->importVCardFromData( vCard );
}
Index: kaddressbook/kaddressbookiface.h
===================================================================
--- kaddressbook/kaddressbookiface.h (Revision 861925)
+++ kaddressbook/kaddressbookiface.h (Arbeitskopie)
@@ -36,7 +36,7 @@
k_dcop:
virtual void addEmail( QString addr ) = 0;
virtual void importVCard( const KURL& url ) = 0;
- virtual void importVCardFromData( const QString& vCard ) = 0;
+ virtual void importVCardFromData( const QCString& vCard ) = 0;
virtual ASYNC showContactEditor( QString uid ) = 0;
Index: kaddressbook/kaddressbookservice.h
===================================================================
--- kaddressbook/kaddressbookservice.h (Revision 861925)
+++ kaddressbook/kaddressbookservice.h (Arbeitskopie)
@@ -40,7 +40,7 @@
@param vCard The vCard in string representation.
*/
- void importVCardFromData( const QString& vCard );
+ void importVCardFromData( const QCString& vCard );
/**
This method will add a vcard to the address book.
Index: kaddressbook/xxportmanager.h
===================================================================
--- kaddressbook/xxportmanager.h (Revision 861925)
+++ kaddressbook/xxportmanager.h (Arbeitskopie)
@@ -49,11 +49,11 @@
void saveSettings();
static KURL importURL;
- static QString importData;
+ static QCString importData;
public slots:
void importVCard( const KURL &url );
- void importVCardFromData( const QString &vCard );
+ void importVCardFromData( const QCString &vCard );
signals:
void modified();
Index: kaddressbook/kabcore.h
===================================================================
--- kaddressbook/kabcore.h (Revision 861925)
+++ kaddressbook/kabcore.h (Arbeitskopie)
@@ -301,7 +301,7 @@
/**
DCOP METHOD: Imports the given vCard.
*/
- virtual void importVCardFromData( const QString& vCard );
+ virtual void importVCardFromData( const QCString& vCard );
/**
DCOP METHOD: Opens contact editor to input a new contact.
Index: kaddressbook/kaddressbookmain.cpp
===================================================================
--- kaddressbook/kaddressbookmain.cpp (Revision 861925)
+++ kaddressbook/kaddressbookmain.cpp (Arbeitskopie)
@@ -89,7 +89,7 @@
mCore->importVCard( url );
}
-void KAddressBookMain::importVCardFromData( const QString& vCard )
+void KAddressBookMain::importVCardFromData( const QCString& vCard )
{
mCore->importVCardFromData( vCard );
}
Index: kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
===================================================================
--- kaddressbook/thumbnailcreator/ldifvcardcreator.cpp (Revision 861925)
+++ kaddressbook/thumbnailcreator/ldifvcardcreator.cpp (Arbeitskopie)
@@ -75,7 +75,9 @@
text.truncate(0);
// read the file
- QString contents = file.readAll();
+ const QByteArray data = file.readAll();
+ const QString contents( data );
+ const QCString contentsRaw( data.data(), data.size() );
file.close();
// convert the file contents to a KABC::Addressee address
@@ -83,7 +85,7 @@
KABC::Addressee addr;
KABC::VCardConverter converter;
- addrList = converter.parseVCards( contents );
+ addrList = converter.parseVCardsRaw( contentsRaw );
if ( addrList.count() == 0 )
if ( !KABC::LDIFConverter::LDIFToAddressee( contents, addrList ) )
return false;
Index: libkdepim/interfaces/AddressBookServiceIface.h
===================================================================
--- libkdepim/interfaces/AddressBookServiceIface.h (Revision 832457)
+++ libkdepim/interfaces/AddressBookServiceIface.h (Arbeitskopie)
@@ -43,7 +43,7 @@
@param vCard The vCard in string representation.
*/
- virtual void importVCardFromData( const QString& vCard ) = 0;
+ virtual void importVCardFromData( const QCString& vCard ) = 0;
/**
This method will add a vcard to the address book.
Index: kfile-plugins/vcf/kfile_vcf.cpp
===================================================================
--- kfile-plugins/vcf/kfile_vcf.cpp (Revision 832457)
+++ kfile-plugins/vcf/kfile_vcf.cpp (Arbeitskopie)
@@ -64,11 +64,12 @@
// even the vcard thumbnail QString::fromUtf8(buf_name));creator reads the full file ...
// The following is partly copied from there
- QString contents = file.readAll();
+ const QByteArray contents = file.readAll();
+ const QCString data( contents.data(), contents.size() );
file.close();
KABC::VCardConverter converter;
- KABC::Addressee addr = converter.parseVCard(contents);
+ KABC::Addressee addr = converter.parseVCard( data );
KFileMetaInfoGroup group = appendGroup(info, "Technical");
++++++ fix-artwork.diff ++++++
--- kandy/src/kandy.desktop 2009/11/22 09:34:18 1.1
+++ kandy/src/kandy.desktop 2009/11/22 09:34:23
@@ -51,7 +51,7 @@
Comment[zh_CN]=将地址簿数据与移动电话同步的工具
Comment[zh_TW]=將通訊錄與手機同步的工具
Exec=kandy %i %m -caption "%c"
-Icon=kandy
+Icon=kaddressbook
Type=Application
GenericName=Mobile Phone Tool
GenericName[af]=Mobiele Foon Program
++++++ fix_designer_path.diff ++++++
--- libkdepim/kcmdesignerfields.cpp
+++ libkdepim/kcmdesignerfields.cpp
@@ -263,7 +263,7 @@
QVBoxLayout *layout = new QVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
- bool noDesigner = KStandardDirs::findExe("designer").isEmpty();
+ bool noDesigner = ! KStandardDirs::exists("/usr/lib/qt3/bin/designer");
if ( noDesigner )
{
@@ -406,7 +406,7 @@
void KCMDesignerFields::startDesigner()
{
- QString cmdLine = "designer";
+ QString cmdLine = "/usr/lib/qt3/bin/designer";
// check if path exists and create one if not.
QString cepPath = localUiDir();
++++++ groupwarewizard.desktop ++++++
[Desktop Entry]
Encoding=UTF-8
Name=Groupware Wizard
Exec=groupwarewizard
Type=Application
Icon=kontact
Terminal=0
X-KDE-StartupNotify=true
++++++ install-headers.diff ++++++
--- libkdepim/Makefile.am
+++ libkdepim/Makefile.am 2005/02/07 16:51:07
@@ -45,7 +45,7 @@
$(LIB_KIO) $(LIB_KABC) $(LIB_KPARTS) $(LIB_KIMPROXY) $(LIB_POLL) -lqui
# $top_builddir)/libkdepim/resources/libkpimresources.la
-include_HEADERS = kdepimmacros.h
+include_HEADERS = kdepimmacros.h kpimprefs.h
AM_CXXFLAGS = -DQT_PLUGIN
kde_widget_LTLIBRARIES = kdepimwidgets.la
++++++ kdepim_networkstatus_branch.diff ++++++
Index: kmail/kmmainwin.cpp
================================================================================
--- kmail/Makefile.am
+++ kmail/Makefile.am
@@ -32,6 +32,7 @@
../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
../certmanager/lib/libkleopatra.la $(INDEXLIB) \
../libkcal/libkcal.la \
+ -lconnectionmanager \
$(LIB_KHTML) $(LIB_KSPELL) $(LIB_KABC)
kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la
--- kmail/accountmanager.cpp
+++ kmail/accountmanager.cpp
@@ -22,6 +22,7 @@
#include <b>%1:</b></td> %2</td><td></td> %3</td></tr>" )
+ .arg( id )
+ .arg( textToHTML( leftValue ) )
+ .arg( textToHTML( rightValue ) ) );
+}
Index: kitchensync/src/xmldiffalgo.cpp
===================================================================
--- kitchensync/src/xmldiffalgo.cpp (revision 0)
+++ kitchensync/src/xmldiffalgo.cpp (revision 0)
@@ -0,0 +1,161 @@
+/*
+ This file is part of KitchenSync.
+
+ Copyright (c) 2006 Daniel Gollub <b>%1:</b></td> %2</td><td></td> %3</td></tr>" )
+ .arg( id )
+ .arg( textToHTML( leftValue ) )
+ .arg( textToHTML( rightValue ) ) );
+}
Index: libkdepim/diffalgo.cpp
===================================================================
--- libkdepim/diffalgo.cpp (revision 691339)
+++ libkdepim/diffalgo.cpp (working copy)
@@ -73,6 +73,14 @@
(*it)->conflictField( id, leftValue, rightValue );
}
+void DiffAlgo::matchingField( const QString &id, const QString &leftValue,
+ const QString &rightValue )
+{
+ QValueList