Hello community,
here is the log from the commit of package kdepimlibs4
checked in at Fri Nov 2 01:26:47 CET 2007.
--------
--- KDE/kdepimlibs4/kdepimlibs4.changes 2007-10-30 15:34:31.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2007-11-01 11:41:40.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Nov 1 11:41:34 CET 2007 - dmueller@suse.de
+
+- update to 3.95.1
+
+-------------------------------------------------------------------
Old:
----
kdepimlibs-3.95.0.tar.bz2
New:
----
kdepimlibs-3.95.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepimlibs4.spec ++++++
--- /var/tmp/diff_new_pack.q25899/_old 2007-11-02 01:26:40.000000000 +0100
+++ /var/tmp/diff_new_pack.q25899/_new 2007-11-02 01:26:40.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdepimlibs4 (Version 3.95.0)
+# spec file for package kdepimlibs4 (Version 3.95.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,9 +15,9 @@
Group: System/GUI/KDE
Summary: KDE PIM Libraries
Url: http://www.kde.org
-Version: 3.95.0
+Version: 3.95.1
Release: 1
-%define rversion 3.95.0
+%define rversion 3.95.1
Source0: kdepimlibs-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -152,6 +152,8 @@
%_kde_share_dir/config.kcfg/pimemoticons.kcfg
%_kde_share_dir/config.kcfg/mailtransport.kcfg
%changelog
+* Thu Nov 01 2007 - dmueller@suse.de
+- update to 3.95.1
* Tue Oct 30 2007 - dmueller@suse.de
- update to 3.95.0
* Thu Oct 18 2007 - dmueller@suse.de
++++++ kdepimlibs-3.95.0.tar.bz2 -> kdepimlibs-3.95.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kabc/plugins/file/resourcefile.cpp new/kdepimlibs-3.95.1/kabc/plugins/file/resourcefile.cpp
--- old/kdepimlibs-3.95.0/kabc/plugins/file/resourcefile.cpp 2007-10-23 10:37:03.000000000 +0200
+++ new/kdepimlibs-3.95.1/kabc/plugins/file/resourcefile.cpp 2007-10-31 21:36:03.000000000 +0100
@@ -296,14 +296,14 @@
KConfig cfg( KStandardDirs::locateLocal( "data", "kabc/distlists" ) );
KConfigGroup cg( &cfg, "DistributionLists" );
- QMap entryMap = cg.entryMap();
+ const QStringList entryList = cg.keyList();
d->mMissingEntries.clear();
- QMap::ConstIterator it;
- for ( it = entryMap.constBegin(); it != entryMap.constEnd(); ++it ) {
- QString name = it.key();
- QStringList value = cg.readEntry( name, QStringList() );
+ QStringList::ConstIterator it;
+ for ( it = entryList.constBegin(); it != entryList.constEnd(); ++it ) {
+ const QString name = *it;
+ const QStringList value = cg.readEntry( name, QStringList() );
kDebug(5700) << "ResourceFile::loadDistributionLists():" << name
<< ":" << value.join( "," );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kcal/resourcecached.cpp new/kdepimlibs-3.95.1/kcal/resourcecached.cpp
--- old/kdepimlibs-3.95.0/kcal/resourcecached.cpp 2007-10-08 09:43:51.000000000 +0200
+++ new/kdepimlibs-3.95.1/kcal/resourcecached.cpp 2007-10-31 21:36:02.000000000 +0100
@@ -36,6 +36,7 @@
#include
#include
+#include
#include
#include
#include
@@ -197,9 +198,10 @@
d->mSaveInterval = group.readEntry( "SaveInterval", 10 );
d->mSavePolicy = group.readEntry( "SavePolicy", int(SaveNever) );
- QDateTime dt = group.readEntry( "LastLoad", QDateTime() );
+ QDateTime curDt = QDateTime::currentDateTime();
+ QDateTime dt = group.readEntry( "LastLoad", curDt );
d->mLastLoad = KDateTime( dt, KDateTime::UTC );
- dt = group.readEntry( "LastSave", QDateTime() );
+ dt = group.readEntry( "LastSave", curDt );
d->mLastSave = KDateTime( dt, KDateTime::UTC );
setupSaveTimer();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/imap4/imap4.cpp new/kdepimlibs-3.95.1/kioslave/imap4/imap4.cpp
--- old/kdepimlibs-3.95.0/kioslave/imap4/imap4.cpp 2007-10-23 10:37:02.000000000 +0200
+++ new/kdepimlibs-3.95.1/kioslave/imap4/imap4.cpp 2007-10-31 21:36:03.000000000 +0100
@@ -1208,6 +1208,7 @@
* AnnotateMore commands: data = 'M' + 'G'et/'S'et + URL + entry + command-dependent args
* Search: data = 'E' + URL (KUrl)
* Quota commands: data = 'Q' + 'R'oot/'G'et/'S'et + URL + entry + command-dependent args
+ * Custom command: data = 'X' + 'N'ormal/'E'xtended + command + command-dependent args
*/
void
IMAP4Protocol::special (const QByteArray & aData)
@@ -1249,6 +1250,7 @@
return;
}
completeQueue.removeAll (cmd);
+ delete cmd;
finished();
break;
}
@@ -1419,6 +1421,12 @@
specialSearchCommand( stream );
break;
}
+ case 'X':
+ {
+ // custom command
+ specialCustomCommand( stream );
+ break;
+ }
default:
kWarning(7116) <<"Unknown command in special():" << tmp;
error( ERR_UNSUPPORTED_ACTION, QString(QChar(tmp)) );
@@ -1557,6 +1565,85 @@
}
void
+IMAP4Protocol::specialCustomCommand( QDataStream& stream )
+{
+ kDebug(7116) << "IMAP4Protocol::specialCustomCommand" << endl;
+
+ QString command, arguments;
+ int type;
+ stream >> type;
+ stream >> command >> arguments;
+
+ /**
+ * In 'normal' mode we send the command with all information in one go
+ * and retrieve the result.
+ */
+ if ( type == 'N' ) {
+ kDebug(7116) << "IMAP4Protocol::specialCustomCommand: normal mode" << endl;
+ imapCommand *cmd = doCommand (imapCommand::clientCustom( command, arguments ));
+ if (cmd->result () != "OK")
+ {
+ error(ERR_SLAVE_DEFINED, i18n("Custom command %1:%2 "
+ "failed. The server returned: %3")
+ .arg(command)
+ .arg(arguments)
+ .arg(cmd->resultInfo()));
+ return;
+ }
+ completeQueue.removeAll(cmd);
+ QStringList lst = getResults();
+ kDebug(7116) << "IMAP4Protocol::specialCustomCommand '" << command <<
+ ":" << arguments <<
+ "' returns " << lst << endl;
+ infoMessage( lst.join( " " ) );
+
+ finished();
+ } else
+ /**
+ * In 'extended' mode we send a first header and push the data of the request in
+ * streaming mode.
+ */
+ if ( type == 'E' ) {
+ kDebug(7116) << "IMAP4Protocol::specialCustomCommand: extended mode" << endl;
+ imapCommand *cmd = sendCommand (imapCommand::clientCustom( command, QString() ));
+ while ( !parseLoop () );
+
+ // see if server is waiting
+ if (!cmd->isComplete () && !getContinuation ().isEmpty ())
+ {
+ const QByteArray buffer = arguments.toUtf8();
+
+ // send data to server
+ bool sendOk = (write (buffer.data (), buffer.size ()) == (ssize_t)buffer.size ());
+ processedSize( buffer.size() );
+
+ if ( !sendOk ) {
+ error ( ERR_CONNECTION_BROKEN, myHost );
+ completeQueue.removeAll ( cmd );
+ setState(ISTATE_CONNECT);
+ closeConnection();
+ return;
+ }
+ }
+ parseWriteLine ("");
+
+ do
+ {
+ while (!parseLoop ());
+ }
+ while (!cmd->isComplete ());
+
+ completeQueue.removeAll (cmd);
+
+ QStringList lst = getResults();
+ kDebug(7116) << "IMAP4Protocol::specialCustomCommand: returns " << lst << endl;
+ infoMessage( lst.join( " " ) );
+
+ finished ();
+ }
+}
+
+void
IMAP4Protocol::specialAnnotateMoreCommand( int command, QDataStream& stream )
{
// All commands start with the URL to the box
@@ -1948,6 +2035,7 @@
kDebug(7116) <<"'" << (*it) <<"'";
}
completeQueue.removeAll (cmd);
+ delete cmd;
if (!hasCapability("IMAP4") && !hasCapability("IMAP4rev1"))
{
@@ -1989,9 +2077,11 @@
kWarning(7116) <<"TLS mode setup has failed. Aborting.";
error (ERR_COULD_NOT_LOGIN, i18n("Starting TLS failed."));
closeConnection();
+ delete cmd;
return false;
}
} else completeQueue.removeAll(cmd);
+ delete cmd;
}
if (!myAuth.isEmpty () && myAuth != "*"
@@ -2051,6 +2141,7 @@
kDebug(7116) <<"makeLogin - registered namespaces";
}
completeQueue.removeAll (cmd);
+ delete cmd;
}
// get the default delimiter (empty listing)
cmd = doCommand( imapCommand::clientList("", "") );
@@ -2070,6 +2161,7 @@
}
}
completeQueue.removeAll (cmd);
+ delete cmd;
} else {
kDebug(7116) <<"makeLogin - NO login";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/imap4/imap4.h new/kdepimlibs-3.95.1/kioslave/imap4/imap4.h
--- old/kdepimlibs-3.95.0/kioslave/imap4/imap4.h 2007-10-08 09:43:51.000000000 +0200
+++ new/kdepimlibs-3.95.1/kioslave/imap4/imap4.h 2007-10-31 21:36:03.000000000 +0100
@@ -178,6 +178,9 @@
/** Search current folder, the search string is passed as SECTION */
void specialSearchCommand( QDataStream& );
+ /** Send a custom command to the server */
+ void specialCustomCommand( QDataStream& );
+
private:
// This method behaves like the above method but takes an already encoded url,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/imap4/imapcommand.cpp new/kdepimlibs-3.95.1/kioslave/imap4/imapcommand.cpp
--- old/kdepimlibs-3.95.0/kioslave/imap4/imapcommand.cpp 2007-10-03 13:30:05.000000000 +0200
+++ new/kdepimlibs-3.95.1/kioslave/imap4/imapcommand.cpp 2007-10-31 21:36:03.000000000 +0100
@@ -402,3 +402,9 @@
return new imapCommand ("GETQUOTAROOT", parameter);
}
+imapCommand *
+imapCommand::clientCustom( const QString& command, const QString& arguments )
+{
+ return new imapCommand (command, arguments);
+}
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/imap4/imapcommand.h new/kdepimlibs-3.95.1/kioslave/imap4/imapcommand.h
--- old/kdepimlibs-3.95.0/kioslave/imap4/imapcommand.h 2007-10-03 13:30:05.000000000 +0200
+++ new/kdepimlibs-3.95.1/kioslave/imap4/imapcommand.h 2007-10-31 21:36:03.000000000 +0100
@@ -371,6 +371,14 @@
*/
static imapCommand *clientGetQuotaroot ( const QString& box );
+ /**
+ * @brief Create a custom command
+ * @param command The custom command
+ * @param arguments The custom arguments
+ * @return a custom imapCommand
+ */
+ static imapCommand *clientCustom ( const QString& command, const QString& arguments );
+
protected:
QString aCommand;
QString mId;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/imap4/imapparser.cpp new/kdepimlibs-3.95.1/kioslave/imap4/imapparser.cpp
--- old/kdepimlibs-3.95.0/kioslave/imap4/imapparser.cpp 2007-10-23 10:37:02.000000000 +0200
+++ new/kdepimlibs-3.95.1/kioslave/imap4/imapparser.cpp 2007-10-31 21:36:03.000000000 +0100
@@ -122,7 +122,10 @@
|| command == "GETANNOTATION"
|| command == "NAMESPACE"
|| command == "GETQUOTAROOT"
- || command == "GETQUOTA")
+ || command == "GETQUOTA"
+ || command == "X-GET-OTHER-USERS"
+ || command == "X-GET-DELEGATES"
+ || command == "X-GET-OUT-OF-OFFICE")
{
lastResults.clear ();
}
@@ -154,7 +157,7 @@
}
resultInfo = cmd->resultInfo();
completeQueue.removeAll (cmd);
-
+ delete cmd;
return retVal;
}
@@ -372,6 +375,15 @@
if (what[1] == 'K' && what.size() == 2)
{
parseResult (what, result);
+ } else if (qstrncmp(what, "OTHER-USER", 10) == 0) { // X-GET-OTHER-USER
+ parseOtherUser (result);
+ } else if (qstrncmp(what, "OUT-OF-OFFICE", 13) == 0) { // X-GET-OUT-OF-OFFICE
+ parseOutOfOffice (result);
+ }
+ break;
+ case 'D':
+ if (qstrncmp(what, "DELEGATE", 8) == 0) { // X-GET-DELEGATES
+ parseDelegate (result);
}
break;
@@ -449,7 +461,12 @@
{
parseQuota( result );
}
-
+ break;
+ case 'X': // Custom command
+ {
+ parseCustom( result );
+ }
+ break;
default:
//better be a number
{
@@ -775,6 +792,40 @@
lastResults.append( roots.join(" ") );
}
+void imapParser::parseCustom (parseString & result)
+{
+ QByteArray word = parseLiteral (result, false, false);
+ lastResults.append( word );
+}
+
+void imapParser::parseOtherUser (parseString & result)
+{
+ lastResults.append( parseOneWord ( result ) );
+}
+
+void imapParser::parseDelegate (parseString & result)
+{
+ const QString email = parseOneWord ( result );
+
+ QStringList rights;
+ while ( !result.isEmpty() ) {
+ QByteArray word = parseLiteral ( result, false, false );
+ rights.append( word );
+ }
+
+ lastResults.append( email + ":" + rights.join( "," ) );
+}
+
+void imapParser::parseOutOfOffice (parseString & result)
+{
+ const QString state = parseOneWord (result);
+ parseOneWord (result); // skip encoding
+
+ QByteArray msg = parseLiteral (result, false, false);
+
+ lastResults.append( state + "^" + QString::fromUtf8( msg ) );
+}
+
void imapParser::parseMyRights (parseString & result)
{
parseOneWord (result); // skip mailbox name
@@ -1840,8 +1891,7 @@
{
bool proper;
long runLenSave = runLen + 1;
- QByteArray tmpstr;
- tmpstr.resize(runLen);
+ QByteArray tmpstr(runLen, '\0');
inWords.takeMidNoResize(tmpstr, 1, runLen - 1);
runLen = tmpstr.toULong (&proper);
inWords.pos += runLenSave;
@@ -1903,7 +1953,7 @@
inWords.takeLeftNoResize(retVal, i - 1);
len = i - 1;
int offset = 0;
- for (unsigned int j = 0; j <= len; j++) {
+ for (unsigned int j = 0; j < len; j++) {
if (retVal[j] == '\\') {
offset++;
j++;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/imap4/imapparser.h new/kdepimlibs-3.95.1/kioslave/imap4/imapparser.h
--- old/kdepimlibs-3.95.0/kioslave/imap4/imapparser.h 2007-10-03 13:30:05.000000000 +0200
+++ new/kdepimlibs-3.95.1/kioslave/imap4/imapparser.h 2007-10-31 21:36:03.000000000 +0100
@@ -281,6 +281,14 @@
void parseQuotaRoot (parseString & result);
/** @brief parse a QUOTA line */
void parseQuota (parseString & result);
+ /** @brief parse a custom command line */
+ void parseCustom (parseString & result);
+ /** @brief parse a OTHER-USER line */
+ void parseOtherUser (parseString & result);
+ /** @brief parse a DELEGATE line */
+ void parseDelegate (parseString & result);
+ /** @brief parse a OUT-OF-OFFICE line */
+ void parseOutOfOffice (parseString & result);
/**
* parses the results of a fetch command
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/sieve/sieve.protocol new/kdepimlibs-3.95.1/kioslave/sieve/sieve.protocol
--- old/kdepimlibs-3.95.0/kioslave/sieve/sieve.protocol 2007-10-16 16:49:25.000000000 +0200
+++ new/kdepimlibs-3.95.1/kioslave/sieve/sieve.protocol 2007-10-31 21:36:03.000000000 +0100
@@ -13,6 +13,7 @@
Icon=remote
Description=An ioslave for the Sieve mail filtering protocol
Description[ca]=Un 'ioslave' pel protocol de filtrat de correu Sieve
+Description[de]=Ein Ein-/Ausgabemodul für das Mailfilter-Protokoll Sieve
Description[el]=Ένα ioslave για το πρωτόκολλο φιλτραρίσματος αλληλογραφίας Sieve
Description[es]=Un esclavo de E/S para el protocolo de filtrado de correo Sieve
Description[fr]=Un ioslave pour le protocole de filtrage de messagerie Sieve
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/smtp/smtp.cpp new/kdepimlibs-3.95.1/kioslave/smtp/smtp.cpp
--- old/kdepimlibs-3.95.0/kioslave/smtp/smtp.cpp 2007-10-08 09:43:51.000000000 +0200
+++ new/kdepimlibs-3.95.1/kioslave/smtp/smtp.cpp 2007-10-31 21:36:02.000000000 +0100
@@ -55,19 +55,12 @@
#include
-#ifdef __GNUC__
-#warning Port to QTcpSocket
-#endif
-#if 0
-#include
-#endif
-
#include
#include
#include
#include
-
+#include <QHostInfo>
#include <memory>
using std::auto_ptr;
@@ -77,22 +70,8 @@
#include
#include
#include
-
-#ifdef HAVE_SYS_TYPES_H
-# include
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-# include
-#endif
#include
-#ifndef NI_NAMEREQD
-// FIXME for KDE 3.3: fake defintion
-// API design flaw in KExtendedSocket::resolve
-# define NI_NAMEREQD 0
-#endif
-
-
extern "C" {
KDE_EXPORT int kdemain(int argc, char **argv);
}
@@ -132,20 +111,6 @@
//kDebug(7112) << "SMTPProtocol::SMTPProtocol";
}
-unsigned int SMTPProtocol::sendBufferSize() const {
- // ### how much is eaten by SSL/TLS overhead?
-#ifdef __GNUC__
-#warning Port to QTcpSocket
-#endif
- const int fd = 0L; //fileno( fp );
- int value = -1;
- socklen_t len = sizeof(value);
- if ( fd < 0 || ::getsockopt( fd, SOL_SOCKET, SO_SNDBUF, (char*)&value, &len ) )
- value = 1024; // let's be conservative
- kDebug(7112) << "send buffer size seems to be " << value << " octets.";
- return value > 0 ? value : 1024 ;
-}
-
SMTPProtocol::~SMTPProtocol() {
//kDebug(7112) << "SMTPProtocol::~SMTPProtocol";
smtp_close();
@@ -409,12 +374,6 @@
return cmdLine;
const unsigned int currentCmdLine_len = currentCmdLine.length();
- if ( cmdLine_len && cmdLine_len + currentCmdLine_len > sendBufferSize() ) {
- // must all fit into the send buffer, else connection deadlocks,
- // but we need to have at least _one_ command to send
- cmd->ungetCommandLine( currentCmdLine, ts );
- return cmdLine;
- }
cmdLine_len += currentCmdLine_len;
cmdLine += currentCmdLine;
}
@@ -534,22 +493,7 @@
}
else
{
- QString tmpPort;
-#ifdef __GNUC__
-#warning Port to QTcpSocket
-#endif
-#if 0
- KSocketAddress* addr = KExtendedSocket::localAddress(m_iSock);
- // perform name lookup. NI_NAMEREQD means: don't return a numeric
- // value (we need to know when we get have the IP address, so we
- // can enclose it in sqaure brackets (domain-literal). Failure to
- // do so is normally harmless with IPv4, but fails for IPv6:
- if (KExtendedSocket::resolve(addr, m_hostname, tmpPort, NI_NAMEREQD) != 0)
- // FQDN resolution failed
- // use the IP address as domain-literal
- m_hostname = '[' + addr->nodeName() + ']';
- delete addr;
-#endif
+ m_hostname = QHostInfo::localHostName();
if(m_hostname.isEmpty())
{
m_hostname = "localhost.invalid";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kioslave/smtp/smtp.h new/kdepimlibs-3.95.1/kioslave/smtp/smtp.h
--- old/kdepimlibs-3.95.0/kioslave/smtp/smtp.h 2007-10-08 09:43:51.000000000 +0200
+++ new/kdepimlibs-3.95.1/kioslave/smtp/smtp.h 2007-10-31 21:36:02.000000000 +0100
@@ -112,9 +112,6 @@
return haveCapability("PIPELINING") && metaData("pipelining") != "off" ;
}
- /** Wrapper around getsockopt(..., SO_SNDBUF,...) */
- unsigned int sendBufferSize() const;
-
/** This is a pure convenience wrapper around
@ref KioSMTP::Capabilities::createSpecialResponse */
QString createSpecialResponse() const {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kldap/ldapoperation.cpp new/kdepimlibs-3.95.1/kldap/ldapoperation.cpp
--- old/kdepimlibs-3.95.0/kldap/ldapoperation.cpp 2007-10-03 13:30:06.000000000 +0200
+++ new/kdepimlibs-3.95.1/kldap/ldapoperation.cpp 2007-10-31 21:36:03.000000000 +0100
@@ -338,7 +338,7 @@
kDebug(5322) << "binding to server, bindname: " << bindname << " password: *****";
if ( async ) {
- kDebug() << "ldap_sasl_bind (simple)";
+ kDebug(5322) << "ldap_sasl_bind (simple)";
int msgid;
ret = ldap_sasl_bind( ld, bindname.data(), 0, &ccred, 0, 0, &msgid );
// ret = ldap_simple_bind( ld, bindname.data(),pass.data() );
@@ -346,7 +346,7 @@
ret = msgid;
}
} else {
- kDebug() << "ldap_sasl_bind_s (simple)";
+ kDebug(5322) << "ldap_sasl_bind_s (simple)";
ret = ldap_sasl_bind_s( ld, bindname.data(), 0, &ccred, 0, 0, 0 );
// ret = ldap_simple_bind_s( ld, bindname.data(), pass.data() );
}
@@ -391,6 +391,8 @@
ldap_value_free_len( bvals );
}
attrs[ QString::fromLatin1( name ) ] = values;
+ ldap_memfree( name );
+
// next attribute
name = ldap_next_attribute( ld, msg, entry );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kpimidentities/identity.cpp new/kdepimlibs-3.95.1/kpimidentities/identity.cpp
--- old/kdepimlibs-3.95.0/kpimidentities/identity.cpp 2007-10-08 09:43:51.000000000 +0200
+++ new/kdepimlibs-3.95.1/kpimidentities/identity.cpp 2007-10-31 21:36:02.000000000 +0100
@@ -95,6 +95,7 @@
mPropertiesMap.insert( i.key(), i.value() );
++i;
}
+ mSignature.readConfig( config );
}
void Identity::writeConfig( KConfigGroup &config ) const
@@ -235,7 +236,8 @@
bool Identity::operator== ( const Identity &other ) const
{
- return mPropertiesMap == other.mPropertiesMap;
+ return mPropertiesMap == other.mPropertiesMap &&
+ mSignature == other.mSignature;
}
bool Identity::operator!= ( const Identity &other ) const
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/kxmlrpcclient/query.cpp new/kdepimlibs-3.95.1/kxmlrpcclient/query.cpp
--- old/kdepimlibs-3.95.0/kxmlrpcclient/query.cpp 2007-10-08 09:43:51.000000000 +0200
+++ new/kdepimlibs-3.95.1/kxmlrpcclient/query.cpp 2007-10-31 21:36:02.000000000 +0100
@@ -443,6 +443,7 @@
for ( it = d->mPendingJobs.begin(); it != d->mPendingJobs.end(); ++it ) {
(*it)->kill();
}
+ delete d;
}
#include "query.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/mailtransport/smtpjob.cpp new/kdepimlibs-3.95.1/mailtransport/smtpjob.cpp
--- old/kdepimlibs-3.95.0/mailtransport/smtpjob.cpp 2007-10-08 09:43:52.000000000 +0200
+++ new/kdepimlibs-3.95.1/mailtransport/smtpjob.cpp 2007-10-31 21:36:03.000000000 +0100
@@ -82,6 +82,7 @@
KIO::Scheduler::disconnectSlave( slave );
slavePool.clear();
}
+ delete d;
}
void SmtpJob::doStart()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/mailtransport/socket.cpp new/kdepimlibs-3.95.1/mailtransport/socket.cpp
--- old/kdepimlibs-3.95.0/mailtransport/socket.cpp 2007-08-29 11:51:23.000000000 +0200
+++ new/kdepimlibs-3.95.1/mailtransport/socket.cpp 2007-10-31 21:36:03.000000000 +0100
@@ -135,6 +135,7 @@
Socket::~Socket()
{
kDebug( 5324 ) << objectName() ;
+ delete d;
}
void Socket::reconnect()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/mailtransport/transportcombobox.cpp new/kdepimlibs-3.95.1/mailtransport/transportcombobox.cpp
--- old/kdepimlibs-3.95.0/mailtransport/transportcombobox.cpp 2007-08-29 11:51:23.000000000 +0200
+++ new/kdepimlibs-3.95.1/mailtransport/transportcombobox.cpp 2007-10-31 21:36:03.000000000 +0100
@@ -46,6 +46,11 @@
SLOT(fillComboBox()) );
}
+TransportComboBox::~TransportComboBox()
+{
+ delete d;
+}
+
int TransportComboBox::currentTransportId() const
{
if( currentIndex() >= 0 && currentIndex() < d->transports.count() )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/mailtransport/transportcombobox.h new/kdepimlibs-3.95.1/mailtransport/transportcombobox.h
--- old/kdepimlibs-3.95.0/mailtransport/transportcombobox.h 2007-07-26 12:35:11.000000000 +0200
+++ new/kdepimlibs-3.95.1/mailtransport/transportcombobox.h 2007-10-31 21:36:03.000000000 +0100
@@ -42,6 +42,8 @@
*/
TransportComboBox( QWidget *parent = 0 );
+ ~TransportComboBox();
+
/**
Returns identifier of the currently selected mail transport.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/mailtransport/transporttypedialog.cpp new/kdepimlibs-3.95.1/mailtransport/transporttypedialog.cpp
--- old/kdepimlibs-3.95.0/mailtransport/transporttypedialog.cpp 2007-05-03 10:36:19.000000000 +0200
+++ new/kdepimlibs-3.95.1/mailtransport/transporttypedialog.cpp 2007-10-31 21:36:03.000000000 +0100
@@ -45,6 +45,11 @@
d->buttonGroup = ui.kcfg_type;
}
+TransportTypeDialog::~TransportTypeDialog()
+{
+ delete d;
+}
+
int TransportTypeDialog::transportType() const
{
return d->buttonGroup->selected();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/mailtransport/transporttypedialog.h new/kdepimlibs-3.95.1/mailtransport/transporttypedialog.h
--- old/kdepimlibs-3.95.0/mailtransport/transporttypedialog.h 2007-06-27 12:40:41.000000000 +0200
+++ new/kdepimlibs-3.95.1/mailtransport/transporttypedialog.h 2007-10-31 21:36:03.000000000 +0100
@@ -41,6 +41,8 @@
*/
TransportTypeDialog( QWidget *parent = 0 );
+ ~TransportTypeDialog();
+
/**
Returns the selected transport type.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/syndication/tests/testpersonimpl.cpp new/kdepimlibs-3.95.1/syndication/tests/testpersonimpl.cpp
--- old/kdepimlibs-3.95.0/syndication/tests/testpersonimpl.cpp 2007-07-26 12:35:09.000000000 +0200
+++ new/kdepimlibs-3.95.1/syndication/tests/testpersonimpl.cpp 2007-10-31 21:36:02.000000000 +0100
@@ -63,6 +63,18 @@
s.append("Foo Bar ");
p.append(PersonPtr(new PersonImpl("Foo Bar", QString(), "foo@bar.com")));
+ s.append("John Doe (President) ");
+ p.append(PersonPtr(new PersonImpl("John Doe (President)", QString(), "john@doe.com")));
+
+ s.append("John Doe (President)");
+ p.append(PersonPtr(new PersonImpl("John Doe (President)", QString(), QString() )));
+
+ s.append("John Doe (President)) ");
+ p.append(PersonPtr(new PersonImpl("John Doe (President))", QString(), "john@doe.com")));
+
+ s.append("(President) John Doe ");
+ p.append(PersonPtr(new PersonImpl("(President) John Doe", QString(), "john@doe.com")));
+
s.append(" (Foo Bar)");
p.append(PersonPtr(new PersonImpl("Foo Bar", QString(), "foo@bar.com")));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.0/syndication/tools.cpp new/kdepimlibs-3.95.1/syndication/tools.cpp
--- old/kdepimlibs-3.95.0/syndication/tools.cpp 2007-07-26 12:35:10.000000000 +0200
+++ new/kdepimlibs-3.95.1/syndication/tools.cpp 2007-10-31 21:36:02.000000000 +0100
@@ -251,13 +251,15 @@
name = str.simplified();
- // str might have the format "foo@bar.com (Foo M. Bar)".
- // We cut off parentheses if there are any
- QRegExp rename("\\(([^\\)]*)\\)");
-
- pos = rename.indexIn(name);
-
- if (pos != -1)
+ // after removing the email, str might have
+ // the format "(Foo M. Bar)". We cut off
+ // parentheses if there are any. However, if
+ // str is of the format "Foo M. Bar (President)",
+ // we should not cut anything.
+
+ QRegExp rename("^\\(([^\\)]*)\\)");
+
+ if (rename.exactMatch(name))
{
name = rename.cap(1);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org