Hello community, here is the log from the commit of package kdepimlibs4 checked in at Mon Mar 10 02:57:50 CET 2008. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2008-03-03 23:14:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2008-03-07 14:52:22.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 7 14:51:27 CET 2008 - dmueller@suse.de + +- update to 4.0.65 snapshot: + * fixes kabc signal/slot connections + +------------------------------------------------------------------- Old: ---- kdepimlibs-4.0.64.tar.bz2 New: ---- kdepimlibs-4.0.65.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.D22479/_old 2008-03-10 02:57:32.000000000 +0100 +++ /var/tmp/diff_new_pack.D22479/_new 2008-03-10 02:57:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdepimlibs4 (Version 4.0.64) +# spec file for package kdepimlibs4 (Version 4.0.65) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,9 +16,9 @@ Group: System/GUI/KDE Summary: KDE PIM Libraries Url: http://www.kde.org -Version: 4.0.64 +Version: 4.0.65 Release: 1 -%define rversion 4.0.64 +%define rversion 4.0.65 Source0: kdepimlibs-%rversion.tar.bz2 Source1: _upstream Patch0: 4_1_BRANCH.diff @@ -69,10 +69,10 @@ The KDE Team <kde@kde.org> %post -n libkdepimlibs4 -/sbin/ldconfig +%run_ldconfig %postun -n libkdepimlibs4 -/sbin/ldconfig +%run_ldconfig %files -n libkdepimlibs4 %defattr(-,root,root) @@ -156,6 +156,9 @@ %_kde_share_dir/config.kcfg/mailtransport.kcfg %changelog +* Fri Mar 07 2008 dmueller@suse.de +- update to 4.0.65 snapshot: + * fixes kabc signal/slot connections * Tue Mar 04 2008 stbinner@suse.de - update to 4.0.64 snapshot * Fri Feb 15 2008 dmueller@suse.de ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.D22479/_old 2008-03-10 02:57:32.000000000 +0100 +++ /var/tmp/diff_new_pack.D22479/_new 2008-03-10 02:57:32.000000000 +0100 @@ -1,85 +1,7 @@ -package: kdepimlibs-4.0.64.tar.bz2 +package: kdepimlibs-4.0.65.tar.bz2 kdemod: kdepimlibs --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 780976 -+svn di between //trunk/KDE/kdepimlibs@780325 and //trunk/KDE/kdepimlibs ---- kcal/calendarlocal.cpp -+++ kcal/calendarlocal.cpp -@@ -223,7 +223,7 @@ - void CalendarLocal::Private::insertTodo( Todo *todo ) - { - QString uid = todo->uid(); -- if ( mTodos.value( uid ) == 0 ) { -+ if ( !mTodos.contains( uid ) ) { - mTodos.insert( uid, todo ); - if ( todo->hasDueDate() ) { - mTodosForDate.insert( todo->dtDue().date().toString(), todo ); -@@ -339,7 +339,7 @@ - void CalendarLocal::Private::insertEvent( Event *event ) - { - QString uid = event->uid(); -- if ( mEvents.value( uid ) == 0 ) { -+ if ( !mEvents.contains( uid ) ) { - mEvents.insert( uid, event ); - if ( !event->recurs() ) { - mEventsForDate.insert( event->dtStart().date().toString(), event ); -@@ -516,7 +516,7 @@ - void CalendarLocal::Private::insertJournal( Journal *journal ) - { - QString uid = journal->uid(); -- if ( mJournals.value( uid ) == 0 ) { -+ if ( !mJournals.contains( uid ) ) { - mJournals.insert( uid, journal ); - mJournalsForDate.insert( journal->dtStart().date().toString(), journal ); - } else { ---- kabc/resourceabc.h -+++ kabc/resourceabc.h -@@ -97,13 +97,13 @@ - /** - * This signal is emitted when a subresource is added. - */ -- void signalSubresourceAdded( ResourceABC *, const QString &type, -+ void signalSubresourceAdded( KABC::ResourceABC *, const QString &type, - const QString &subResource ); - - /** - * This signal is emitted when a subresource is removed. - */ -- void signalSubresourceRemoved( ResourceABC *, const QString &type, -+ void signalSubresourceRemoved( KABC::ResourceABC *, const QString &type, - const QString &subResource ); - - }; ---- kabc/lock.cpp -+++ kabc/lock.cpp -@@ -42,11 +42,16 @@ - public: - Private( const QString &identifier ) - : mIdentifier( identifier ) -+ , mOrigIdentifier( identifier ) - { - mIdentifier.replace( "/", "_" ); -+#ifdef Q_WS_WIN -+ mIdentifier.replace( ":", "_" ); -+#endif - } - - QString mIdentifier; -+ QString mOrigIdentifier; - QString mLockUniqueName; - QString mError; - }; -@@ -118,10 +123,7 @@ - QFile::remove( lockName ); - kWarning() << "Removed stale lock file from process '" << app << "'"; - } else { -- QString identifier( d->mIdentifier ); -- identifier.replace( '_', '/' ); -- -- d->mError = i18n( "The resource '%1' is locked by application '%2'.", identifier, app ); -+ d->mError = i18n( "The resource '%1' is locked by application '%2'.", d->mOrigIdentifier, app ); - return false; - } - } ++current HEAD: 782892 ++svn di between //trunk/KDE/kdepimlibs@782844 and //trunk/KDE/kdepimlibs ++++++ kdepimlibs-4.0.64.tar.bz2 -> kdepimlibs-4.0.65.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.64/kabc/lock.cpp new/kdepimlibs-4.0.65/kabc/lock.cpp --- old/kdepimlibs-4.0.64/kabc/lock.cpp 2008-01-29 10:15:02.000000000 +0100 +++ new/kdepimlibs-4.0.65/kabc/lock.cpp 2008-03-06 10:53:30.000000000 +0100 @@ -42,11 +42,16 @@ public: Private( const QString &identifier ) : mIdentifier( identifier ) + , mOrigIdentifier( identifier ) { mIdentifier.replace( "/", "_" ); +#ifdef Q_WS_WIN + mIdentifier.replace( ":", "_" ); +#endif } QString mIdentifier; + QString mOrigIdentifier; QString mLockUniqueName; QString mError; }; @@ -118,10 +123,7 @@ QFile::remove( lockName ); kWarning() << "Removed stale lock file from process '" << app << "'"; } else { - QString identifier( d->mIdentifier ); - identifier.replace( '_', '/' ); - - d->mError = i18n( "The resource '%1' is locked by application '%2'.", identifier, app ); + d->mError = i18n( "The resource '%1' is locked by application '%2'.", d->mOrigIdentifier, app ); return false; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.64/kabc/resourceabc.h new/kdepimlibs-4.0.65/kabc/resourceabc.h --- old/kdepimlibs-4.0.64/kabc/resourceabc.h 2008-01-29 10:15:02.000000000 +0100 +++ new/kdepimlibs-4.0.65/kabc/resourceabc.h 2008-03-06 10:53:30.000000000 +0100 @@ -97,13 +97,13 @@ /** * This signal is emitted when a subresource is added. */ - void signalSubresourceAdded( ResourceABC *, const QString &type, + void signalSubresourceAdded( KABC::ResourceABC *, const QString &type, const QString &subResource ); /** * This signal is emitted when a subresource is removed. */ - void signalSubresourceRemoved( ResourceABC *, const QString &type, + void signalSubresourceRemoved( KABC::ResourceABC *, const QString &type, const QString &subResource ); }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.64/kcal/calendarlocal.cpp new/kdepimlibs-4.0.65/kcal/calendarlocal.cpp --- old/kdepimlibs-4.0.64/kcal/calendarlocal.cpp 2008-01-05 00:53:17.000000000 +0100 +++ new/kdepimlibs-4.0.65/kcal/calendarlocal.cpp 2008-03-06 10:53:29.000000000 +0100 @@ -223,7 +223,7 @@ void CalendarLocal::Private::insertTodo( Todo *todo ) { QString uid = todo->uid(); - if ( mTodos.value( uid ) == 0 ) { + if ( !mTodos.contains( uid ) ) { mTodos.insert( uid, todo ); if ( todo->hasDueDate() ) { mTodosForDate.insert( todo->dtDue().date().toString(), todo ); @@ -339,7 +339,7 @@ void CalendarLocal::Private::insertEvent( Event *event ) { QString uid = event->uid(); - if ( mEvents.value( uid ) == 0 ) { + if ( !mEvents.contains( uid ) ) { mEvents.insert( uid, event ); if ( !event->recurs() ) { mEventsForDate.insert( event->dtStart().date().toString(), event ); @@ -516,7 +516,7 @@ void CalendarLocal::Private::insertJournal( Journal *journal ) { QString uid = journal->uid(); - if ( mJournals.value( uid ) == 0 ) { + if ( !mJournals.contains( uid ) ) { mJournals.insert( uid, journal ); mJournalsForDate.insert( journal->dtStart().date().toString(), journal ); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.64/kcal/person.cpp new/kdepimlibs-4.0.65/kcal/person.cpp --- old/kdepimlibs-4.0.64/kcal/person.cpp 2008-02-28 18:55:13.000000000 +0100 +++ new/kdepimlibs-4.0.65/kcal/person.cpp 2008-03-06 10:53:29.000000000 +0100 @@ -59,6 +59,12 @@ { } +Person::Person( const QString &fullName ) + : d( new Private ) +{ + KPIMUtils::extractEmailAddressAndName( fullName, d->mEmail, d->mName ); +} + Person Person::fromFullName( const QString &fullName ) { QString email, name; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.64/kcal/person.h new/kdepimlibs-4.0.65/kcal/person.h --- old/kdepimlibs-4.0.64/kcal/person.h 2008-02-28 18:55:13.000000000 +0100 +++ new/kdepimlibs-4.0.65/kcal/person.h 2008-03-06 10:53:29.000000000 +0100 @@ -61,6 +61,12 @@ static Person fromFullName( const QString &fullName ); /** + \deprecated + Use fromFullName() instead. + */ + KDE_CONSTRUCTOR_DEPRECATED explicit Person( const QString &fullName ); + + /** Constructs a person with the name @p name and email address @p email. @param name is the name of this person. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.64/kpimidentities/signature.cpp new/kdepimlibs-4.0.65/kpimidentities/signature.cpp --- old/kdepimlibs-4.0.64/kpimidentities/signature.cpp 2008-02-28 18:55:12.000000000 +0100 +++ new/kdepimlibs-4.0.65/kpimidentities/signature.cpp 2008-03-06 10:53:29.000000000 +0100 @@ -140,29 +140,23 @@ QString Signature::withSeparator( bool *ok ) const { - bool internalOK = false; - QString signature = rawText( &internalOK ); - if ( !internalOK ) { - if ( ok ) { - *ok = false; - } + QString signature = rawText( ok ); + if ( ok && (*ok) == false ) return QString(); - } - if ( ok ) { - *ok = true; - } if ( signature.isEmpty() ) { return signature; // don't add a separator in this case } - if ( signature.startsWith( QString::fromLatin1( "-- \n" ) ) - || ( signature.indexOf( QString::fromLatin1( "\n-- \n" ) ) != -1 ) ) { + QString newline = ( isInlinedHtml() && mType == Inlined ) ? "<br>" : "\n"; + if ( signature.startsWith( QString::fromLatin1( "-- " ) + newline ) + || ( signature.indexOf( newline + QString::fromLatin1( "-- " ) + + newline ) != -1 ) ) { // already have signature separator at start of sig or inside sig: return signature; } else { // need to prepend one: - return QString::fromLatin1( "-- \n" ) + signature; + return QString::fromLatin1( "-- " ) + newline + signature; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org