Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2015-06-04 09:51:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepimlibs4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2015-05-15 09:03:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2015-06-04 09:51:22.000000000 +0200 @@ -1,0 +2,8 @@ +Sat May 30 13:20:15 UTC 2015 - tittiatc...@gmail.com + +- Update to 4.14.9 + * KDE Applications 15.04.2 + * https://www.kde.org/announcements/announce-applications-15.04.2.php + + +------------------------------------------------------------------- Old: ---- kdepimlibs-4.14.8.tar.xz New: ---- kdepimlibs-4.14.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.DJWMN7/_old 2015-06-04 09:51:23.000000000 +0200 +++ /var/tmp/diff_new_pack.DJWMN7/_new 2015-06-04 09:51:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdepimlibs4 -Version: 4.14.8 +Version: 4.14.9 Release: 0 Summary: KDE PIM Libraries License: LGPL-2.1+ ++++++ kdepimlibs-4.14.8.tar.xz -> kdepimlibs-4.14.9.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.8/CMakeLists.txt new/kdepimlibs-4.14.9/CMakeLists.txt --- old/kdepimlibs-4.14.8/CMakeLists.txt 2015-05-05 07:49:31.000000000 +0200 +++ new/kdepimlibs-4.14.9/CMakeLists.txt 2015-05-28 23:39:40.000000000 +0200 @@ -7,7 +7,7 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) set(KDEPIMLIBS_VERSION_MINOR 14) -set(KDEPIMLIBS_VERSION_PATCH 8) +set(KDEPIMLIBS_VERSION_PATCH 9) set(KDEPIMLIBS_VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.8/akonadi/contact/contactviewer.cpp new/kdepimlibs-4.14.9/akonadi/contact/contactviewer.cpp --- old/kdepimlibs-4.14.8/akonadi/contact/contactviewer.cpp 2015-05-05 07:49:31.000000000 +0200 +++ new/kdepimlibs-4.14.9/akonadi/contact/contactviewer.cpp 2015-05-28 23:39:40.000000000 +0200 @@ -78,13 +78,18 @@ void updateView( const QVariantList &localCustomFieldDescriptions = QVariantList(), const QString &addressBookName = QString() ) { static QPixmap defaultPixmap = KIcon( QLatin1String( "user-identity" ) ).pixmap( QSize( 100, 100 ) ); - + static QPixmap defaultMapPixmap = KIcon( QLatin1String( "document-open-remote" ) ).pixmap( QSize( 16, 16 ) ); + static QPixmap defaultSmsPixmap = KIcon( IMProtocols::self()->icon( QString::fromLatin1( "messaging/sms" ) ) ).pixmap( QSize( 16, 16 ) ); mParent->setWindowTitle( i18n( "Contact %1", mCurrentContact.assembledName() ) ); if ( mCurrentContact.photo().isIntern() ) { mBrowser->document()->addResource( QTextDocument::ImageResource, QUrl( QLatin1String( "contact_photo" ) ), mCurrentContact.photo().data() ); + } else if (!mCurrentContact.photo().url().isEmpty()) { + mBrowser->document()->addResource( QTextDocument::ImageResource, + QUrl( QLatin1String( "contact_photo" ) ), + defaultPixmap ); } else { mBrowser->document()->addResource( QTextDocument::ImageResource, QUrl( QLatin1String( "contact_photo" ) ), @@ -95,15 +100,17 @@ mBrowser->document()->addResource( QTextDocument::ImageResource, QUrl( QLatin1String( "contact_logo" ) ), mCurrentContact.logo().data() ); + } else if (!mCurrentContact.logo().url().isEmpty()) { + //TODO } mBrowser->document()->addResource( QTextDocument::ImageResource, QUrl( QLatin1String( "map_icon" ) ), - KIcon( QLatin1String( "document-open-remote" ) ).pixmap( QSize( 16, 16 ) ) ); + defaultMapPixmap ); mBrowser->document()->addResource( QTextDocument::ImageResource, QUrl( QLatin1String( "sms_icon" ) ), - KIcon( IMProtocols::self()->icon( QString::fromLatin1( "messaging/sms" ) ) ).pixmap( QSize( 16, 16 ) ) ); + defaultSmsPixmap); #ifdef HAVE_PRISON KConfig config( QLatin1String( "akonadi_contactrc" ) );
