Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at 2015-01-21 22:08:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4-runtime/kdepim4-runtime.changes 2014-11-19 20:27:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim4-runtime.new/kdepim4-runtime.changes 2015-01-21 22:08:18.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 12 19:34:32 UTC 2015 - tittiatc...@gmail.com + +- Update to 4.14.4 + * KDE Applications 14.12.1 + * See https://www.kde.org/announcements/announce-applications-14.12.1.php + +------------------------------------------------------------------- Old: ---- kdepim-runtime-4.14.3.tar.xz New: ---- kdepim-runtime-4.14.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.0cgyan/_old 2015-01-21 22:08:18.000000000 +0100 +++ /var/tmp/diff_new_pack.0cgyan/_new 2015-01-21 22:08:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdepim4-runtime # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: kdepim4-runtime -Version: 4.14.3 +Version: 4.14.4 Release: 0 Summary: Base package of kdepim License: LGPL-2.1+ ++++++ kdepim-runtime-4.14.3.tar.xz -> kdepim-runtime-4.14.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/CMakeLists.txt new/kdepim-runtime-4.14.4/CMakeLists.txt --- old/kdepim-runtime-4.14.3/CMakeLists.txt 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/CMakeLists.txt 2015-01-07 13:28:41.000000000 +0100 @@ -36,7 +36,7 @@ set(KDEPIM_RUNTIME_DEV_VERSION "") endif() -set(KDEPIM_RUNTIME_VERSION "4.14.3${KDEPIM_RUNTIME_DEV_VERSION}") +set(KDEPIM_RUNTIME_VERSION "4.14.4${KDEPIM_RUNTIME_DEV_VERSION}") configure_file(kdepim-runtime-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdepim-runtime-version.h @ONLY) @@ -53,7 +53,7 @@ include(KDE4Defaults) # KdepimLibs -find_package(KdepimLibs 4.14.3) +find_package(KdepimLibs 4.14.4) set_package_properties(KdepimLibs PROPERTIES DESCRIPTION "The KDEPIM libraries" URL "http://www.kde.org"; TYPE REQUIRED) #Boost diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/accountwizard/configfile.cpp new/kdepim-runtime-4.14.4/accountwizard/configfile.cpp --- old/kdepim-runtime-4.14.3/accountwizard/configfile.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/accountwizard/configfile.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2010 Laurent Montel <mon...@kde.org> + Copyright (c) 2010-2015 Laurent Montel <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/accountwizard/configfile.h new/kdepim-runtime-4.14.4/accountwizard/configfile.h --- old/kdepim-runtime-4.14.3/accountwizard/configfile.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/accountwizard/configfile.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2010 Laurent Montel <mon...@kde.org> + Copyright (c) 2010-2015 Laurent Montel <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/accountwizard/identity.cpp new/kdepim-runtime-4.14.4/accountwizard/identity.cpp --- old/kdepim-runtime-4.14.3/accountwizard/identity.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/accountwizard/identity.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2010 Laurent Montel <mon...@kde.org> + Copyright (c) 2010-2015 Laurent Montel <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/accountwizard/identity.h new/kdepim-runtime-4.14.4/accountwizard/identity.h --- old/kdepim-runtime-4.14.3/accountwizard/identity.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/accountwizard/identity.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2010 Laurent Montel <mon...@kde.org> + Copyright (c) 2010-2015 Laurent Montel <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/accountwizard/ldap.cpp new/kdepim-runtime-4.14.4/accountwizard/ldap.cpp --- old/kdepim-runtime-4.14.3/accountwizard/ldap.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/accountwizard/ldap.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2010 Laurent Montel <mon...@kde.org> + Copyright (c) 2010-2015 Laurent Montel <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/accountwizard/ldap.h new/kdepim-runtime-4.14.4/accountwizard/ldap.h --- old/kdepim-runtime-4.14.3/accountwizard/ldap.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/accountwizard/ldap.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2010 Laurent Montel <mon...@kde.org> + Copyright (c) 2010-2015 Laurent Montel <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/invitations/incidenceattribute.cpp new/kdepim-runtime-4.14.4/agents/invitations/incidenceattribute.cpp --- old/kdepim-runtime-4.14.3/agents/invitations/incidenceattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/invitations/incidenceattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -45,7 +45,8 @@ QByteArray IncidenceAttribute::type() const { - return "incidence"; + static const QByteArray sType( "incidence" ); + return sType; } Attribute* IncidenceAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/maildispatcher/sendjob.cpp new/kdepim-runtime-4.14.4/agents/maildispatcher/sendjob.cpp --- old/kdepim-runtime-4.14.3/agents/maildispatcher/sendjob.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/maildispatcher/sendjob.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -189,6 +189,10 @@ message->removeHeader( "X-KMail-Identity" ); needAssemble = true; } + if ( message->hasHeader( "X-KMail-Dictionary") ) { + message->removeHeader( "X-KMail-Dictionary" ); + needAssemble = true; + } if(needAssemble) { message->assemble(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/CMakeLists.txt new/kdepim-runtime-4.14.4/agents/newmailnotifier/CMakeLists.txt --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/CMakeLists.txt 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/CMakeLists.txt 2015-01-07 13:28:41.000000000 +0100 @@ -16,7 +16,6 @@ specialnotifierjob.cpp newmailnotifierselectcollectionwidget.cpp newmailnotifiershowmessagejob.cpp - util.cpp ) kde4_add_kcfg_files(newmailnotifieragent_SRCS @@ -57,3 +56,4 @@ install(FILES akonadi_newmailnotifier_agent.notifyrc DESTINATION "${DATA_INSTALL_DIR}/akonadi_newmailnotifier_agent" ) add_subdirectory(kconf_update) +add_subdirectory(autotests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/autotests/CMakeLists.txt new/kdepim-runtime-4.14.4/agents/newmailnotifier/autotests/CMakeLists.txt --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/autotests/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/autotests/CMakeLists.txt 2015-01-07 13:28:41.000000000 +0100 @@ -0,0 +1,4 @@ + +set( newmailnotifierattribute_source newmailnotifierattributetest.cpp ../newmailnotifierattribute.cpp) +kde4_add_unit_test( newmailnotifierattributetest ${newmailnotifierattribute_source}) +target_link_libraries( newmailnotifierattributetest ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${KDEPIMLIBS_AKONADI_LIBS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/autotests/newmailnotifierattributetest.cpp new/kdepim-runtime-4.14.4/agents/newmailnotifier/autotests/newmailnotifierattributetest.cpp --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/autotests/newmailnotifierattributetest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/autotests/newmailnotifierattributetest.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -0,0 +1,70 @@ +/* + Copyright (c) 2014 Montel Laurent <mon...@kde.org> + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + + +#include "newmailnotifierattributetest.h" +#include "../newmailnotifierattribute.h" +#include <qtest_kde.h> + +NewMailNotifierAttributeTest::NewMailNotifierAttributeTest(QObject *parent) + : QObject(parent) +{ + +} + +NewMailNotifierAttributeTest::~NewMailNotifierAttributeTest() +{ + +} + +void NewMailNotifierAttributeTest::shouldHaveDefaultValue() +{ + NewMailNotifierAttribute attr; + QVERIFY(!attr.ignoreNewMail()); +} + +void NewMailNotifierAttributeTest::shouldSetIgnoreNotification() +{ + NewMailNotifierAttribute attr; + bool ignore = false; + attr.setIgnoreNewMail(ignore); + QCOMPARE(attr.ignoreNewMail(), ignore); + ignore = true; + attr.setIgnoreNewMail(ignore); + QCOMPARE(attr.ignoreNewMail(), ignore); +} + +void NewMailNotifierAttributeTest::shouldSerializedData() +{ + NewMailNotifierAttribute attr; + attr.setIgnoreNewMail(true); + QByteArray ba = attr.serialized(); + NewMailNotifierAttribute result; + result.deserialize(ba); + QVERIFY(attr == result); +} + +void NewMailNotifierAttributeTest::shouldCloneAttribute() +{ + NewMailNotifierAttribute attr; + attr.setIgnoreNewMail(true); + NewMailNotifierAttribute *result = attr.clone(); + QVERIFY(attr == *result); + delete result; +} + +QTEST_KDEMAIN(NewMailNotifierAttributeTest, NoGUI) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/autotests/newmailnotifierattributetest.h new/kdepim-runtime-4.14.4/agents/newmailnotifier/autotests/newmailnotifierattributetest.h --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/autotests/newmailnotifierattributetest.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/autotests/newmailnotifierattributetest.h 2015-01-07 13:28:41.000000000 +0100 @@ -0,0 +1,37 @@ +/* + Copyright (c) 2014 Montel Laurent <mon...@kde.org> + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + + +#ifndef NEWMAILNOTIFIERATTRIBUTETEST_H +#define NEWMAILNOTIFIERATTRIBUTETEST_H + +#include <QObject> + +class NewMailNotifierAttributeTest : public QObject +{ + Q_OBJECT +public: + explicit NewMailNotifierAttributeTest(QObject *parent = 0); + ~NewMailNotifierAttributeTest(); +private Q_SLOTS: + void shouldHaveDefaultValue(); + void shouldSetIgnoreNotification(); + void shouldSerializedData(); + void shouldCloneAttribute(); +}; + +#endif // NEWMAILNOTIFIERATTRIBUTETEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifieragent.cpp new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifieragent.cpp --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifieragent.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifieragent.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013 Laurent Montel <mon...@kde.org> + Copyright (c) 2013-2015 Laurent Montel <mon...@kde.org> Copyright (c) 2010 Volker Krause <vkra...@kde.org> @@ -21,8 +21,6 @@ #include "newmailnotifieragent.h" -#include "util.h" - #include "newmailnotifierattribute.h" #include "specialnotifierjob.h" #include "newmailnotifieradaptor.h" @@ -53,6 +51,8 @@ #include <KConfigGroup> #include <KLocalizedString> #include <KWindowSystem> +#include <KToolInvocation> + using namespace Akonadi; @@ -65,6 +65,7 @@ mIdentityManager = new KPIMIdentities::IdentityManager( false, this ); connect(mIdentityManager, SIGNAL(changed()), SLOT(slotIdentitiesChanged())); slotIdentitiesChanged(); + mDefaultPixmap = KIcon( QLatin1String("kmail") ).pixmap( KIconLoader::SizeMedium, KIconLoader::SizeMedium ); DBusConnectionPool::threadConnection().registerObject( QLatin1String( "/NewMailNotifierAgent" ), this, QDBusConnection::ExportAdaptors ); @@ -91,9 +92,19 @@ mTimer.setInterval( 5 * 1000 ); connect( &mTimer, SIGNAL(timeout()), SLOT(slotShowNotifications()) ); - if (NewMailNotifierAgentSettings::textToSpeakEnabled()) - Util::testJovieService(); - + if (NewMailNotifierAgentSettings::textToSpeakEnabled()) { + if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(QLatin1String("org.kde.kttsd"))) { + QString error; + if (KToolInvocation::startServiceByDesktopName(QLatin1String("kttsd"), QStringList(), &error)) { + KNotification::event( QLatin1String("text-to-speak-not-found"), + i18n("Starting Jovie Text-to-Speech Service Failed %1", error), + mDefaultPixmap, + 0, + KNotification::CloseOnTimeout, + KGlobal::mainComponent()); + } + } + } if (isActive()) { mTimer.setSingleShot( true ); } @@ -460,6 +471,7 @@ } if (hasUniqMessage) { SpecialNotifierJob *job = new SpecialNotifierJob(mListEmails, currentPath, item, this); + job->setDefaultPixmap(mDefaultPixmap); connect(job, SIGNAL(displayNotification(QPixmap,QString)), SLOT(slotDisplayNotification(QPixmap,QString))); mNewMails.clear(); return; @@ -472,7 +484,7 @@ kDebug() << message; - slotDisplayNotification(Util::defaultPixmap(), message); + slotDisplayNotification(mDefaultPixmap, message); mNewMails.clear(); } @@ -480,7 +492,12 @@ void NewMailNotifierAgent::slotDisplayNotification(const QPixmap &pixmap, const QString &message) { - Util::showNotification(pixmap, message); + KNotification::event( QLatin1String("new-email"), + message, + pixmap, + 0, + KNotification::CloseOnTimeout, + KGlobal::mainComponent()); if ( NewMailNotifierAgentSettings::beepOnNewMails() ) { KNotification::beep(); @@ -516,7 +533,7 @@ } case Akonadi::AgentInstance::Running: { - if (!Util::excludeAgentType(instance)) { + if (!excludeAgentType(instance)) { if (!mInstanceNameInProgress.contains(identifier)) { mInstanceNameInProgress.append(identifier); } @@ -529,6 +546,21 @@ } } +bool NewMailNotifierAgent::excludeAgentType(const Akonadi::AgentInstance &instance) +{ + if ( instance.type().mimeTypes().contains( KMime::Message::mimeType() ) ) { + const QStringList capabilities( instance.type().capabilities() ); + if ( capabilities.contains( QLatin1String("Resource") ) && + !capabilities.contains( QLatin1String("Virtual") ) && + !capabilities.contains( QLatin1String("MailTransport") ) ) { + return false; + } else { + return true; + } + } + return true; +} + void NewMailNotifierAgent::slotInstanceRemoved(const Akonadi::AgentInstance &instance) { if (!isActive()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifieragent.h new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifieragent.h --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifieragent.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifieragent.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013 Laurent Montel <mon...@kde.org> + Copyright (c) 2013-2015 Laurent Montel <mon...@kde.org> Copyright (c) 2010 Volker Krause <vkra...@kde.org> @@ -27,7 +27,7 @@ #include <QTimer> #include <QStringList> - +#include <QPixmap> namespace Akonadi { class AgentInstance; } @@ -98,10 +98,12 @@ void slotInstanceNameChanged(const Akonadi::AgentInstance &instance); private: + bool excludeAgentType(const Akonadi::AgentInstance &instance); bool ignoreStatusMail(const Akonadi::Item &item); bool isActive() const; void clearAll(); bool excludeSpecialCollection(const Akonadi::Collection &collection) const; + QPixmap mDefaultPixmap; QStringList mListEmails; QHash<Akonadi::Collection, QList<Akonadi::Item::Id> > mNewMails; QHash<QString, QString> mCacheResourceName; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifierattribute.cpp new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifierattribute.cpp --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifierattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifierattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as @@ -78,3 +78,8 @@ { d->ignoreNewMail = b; } + +bool NewMailNotifierAttribute::operator==(const NewMailNotifierAttribute &other) const +{ + return d->ignoreNewMail == other.ignoreNewMail(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifierattribute.h new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifierattribute.h --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifierattribute.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifierattribute.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as @@ -36,6 +36,7 @@ bool ignoreNewMail() const; void setIgnoreNewMail(bool b); + bool operator==(const NewMailNotifierAttribute &other) const; private: friend class NewMailNotifierAttributePrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifierselectcollectionwidget.cpp new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifierselectcollectionwidget.cpp --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifierselectcollectionwidget.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifierselectcollectionwidget.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013 Laurent Montel <mon...@kde.org> + Copyright (c) 2013-2015 Laurent Montel <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifierselectcollectionwidget.h new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifierselectcollectionwidget.h --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifierselectcollectionwidget.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifierselectcollectionwidget.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013 Laurent Montel <mon...@kde.org> + Copyright (c) 2013-2015 Laurent Montel <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifiersettingsdialog.cpp new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifiersettingsdialog.cpp --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifiersettingsdialog.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifiersettingsdialog.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013 Laurent Montel <mon...@kde.org> + Copyright (c) 2013-2015 Laurent Montel <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifiersettingsdialog.h new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifiersettingsdialog.h --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifiersettingsdialog.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifiersettingsdialog.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013 Laurent Montel <mon...@kde.org> + Copyright (c) 2013-2015 Laurent Montel <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifiershowmessagejob.cpp new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifiershowmessagejob.cpp --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/newmailnotifiershowmessagejob.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/newmailnotifiershowmessagejob.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -52,6 +52,8 @@ } } QDBusInterface kmail(kmailInterface, QLatin1String("/KMail"), QLatin1String("org.kde.kmail.kmail")); - kmail.call(QLatin1String("showMail"), mId); + if (kmail.isValid()) { + kmail.call(QLatin1String("showMail"), mId); + } Q_EMIT emitResult(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/specialnotifierjob.cpp new/kdepim-runtime-4.14.4/agents/newmailnotifier/specialnotifierjob.cpp --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/specialnotifierjob.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/specialnotifierjob.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as @@ -17,7 +17,6 @@ #include "newmailnotifiershowmessagejob.h" #include "specialnotifierjob.h" -#include "util.h" #include "newmailnotifieragentsettings.h" #include <Akonadi/Contact/ContactSearchJob> @@ -55,6 +54,11 @@ } +void SpecialNotifierJob::setDefaultPixmap(const QPixmap &pixmap) +{ + mDefaultPixmap = pixmap; +} + void SpecialNotifierJob::slotItemFetchJobDone(KJob *job) { if ( job->error() ) { @@ -81,7 +85,7 @@ job->setQuery( Akonadi::ContactSearchJob::Email, KPIMUtils::firstEmailAddress(mFrom).toLower(), Akonadi::ContactSearchJob::ExactMatch ); connect( job, SIGNAL(result(KJob*)), SLOT(slotSearchJobFinished(KJob*)) ); } else { - emitNotification(Util::defaultPixmap()); + emitNotification(mDefaultPixmap); deleteLater(); } } else { @@ -96,7 +100,7 @@ const Akonadi::ContactSearchJob *searchJob = qobject_cast<Akonadi::ContactSearchJob*>( job ); if ( searchJob->error() ) { kWarning() << "Unable to fetch contact:" << searchJob->errorText(); - emitNotification(Util::defaultPixmap()); + emitNotification(mDefaultPixmap); return; } if (!searchJob->contacts().isEmpty()) { @@ -104,12 +108,12 @@ const KABC::Picture photo = addressee.photo(); const QImage image = photo.data(); if (image.isNull()) { - emitNotification(Util::defaultPixmap()); + emitNotification(mDefaultPixmap); } else { emitNotification(QPixmap::fromImage(image)); } } else { - emitNotification(Util::defaultPixmap()); + emitNotification(mDefaultPixmap); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/specialnotifierjob.h new/kdepim-runtime-4.14.4/agents/newmailnotifier/specialnotifierjob.h --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/specialnotifierjob.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/specialnotifierjob.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as @@ -22,6 +22,7 @@ #include <QObject> #include <Akonadi/Item> #include <QStringList> +#include <QPixmap> class KJob; class SpecialNotifierJob : public QObject @@ -31,6 +32,8 @@ explicit SpecialNotifierJob(const QStringList &listEmails, const QString &path, Akonadi::Item::Id id, QObject *parent = 0); ~SpecialNotifierJob(); + void setDefaultPixmap(const QPixmap &pixmap); + Q_SIGNALS: void displayNotification(const QPixmap &pixmap, const QString &message); @@ -40,6 +43,7 @@ void slotOpenMail(); private: void emitNotification(const QPixmap &pixmap); + QPixmap mDefaultPixmap; QStringList mListEmails; QString mSubject; QString mFrom; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/util.cpp new/kdepim-runtime-4.14.4/agents/newmailnotifier/util.cpp --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/util.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/util.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,80 +0,0 @@ -/* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include "util.h" - -#include <KNotification> -#include <KLocalizedString> -#include <KGlobal> -#include <KIcon> -#include <KIconLoader> -#include <KToolInvocation> - -#include <Akonadi/AgentInstance> -#include <Akonadi/AgentType> -#include <KMime/Message> - -#include <QDBusInterface> -#include <QDBusConnection> -#include <QDBusConnectionInterface> - - -void Util::testJovieService() -{ - if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(QLatin1String("org.kde.kttsd"))) { - QString error; - if (KToolInvocation::startServiceByDesktopName(QLatin1String("kttsd"), QStringList(), &error)) { - KNotification::event( QLatin1String("text-to-speak-not-found"), - i18n("Starting Jovie Text-to-Speech Service Failed %1", error), - Util::defaultPixmap(), - 0, - KNotification::CloseOnTimeout, - KGlobal::mainComponent()); - } - } -} - -void Util::showNotification(const QPixmap &pixmap, const QString &message) -{ - KNotification::event( QLatin1String("new-email"), - message, - pixmap, - 0, - KNotification::CloseOnTimeout, - KGlobal::mainComponent()); -} - -QPixmap Util::defaultPixmap() -{ - const QPixmap pixmap = KIcon( QLatin1String("kmail") ).pixmap( KIconLoader::SizeMedium, KIconLoader::SizeMedium ); - return pixmap; -} - -bool Util::excludeAgentType(const Akonadi::AgentInstance &instance) -{ - if ( instance.type().mimeTypes().contains( KMime::Message::mimeType() ) ) { - const QStringList capabilities( instance.type().capabilities() ); - if ( capabilities.contains( QLatin1String("Resource") ) && - !capabilities.contains( QLatin1String("Virtual") ) && - !capabilities.contains( QLatin1String("MailTransport") ) ) { - return false; - } else { - return true; - } - } - return true; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/agents/newmailnotifier/util.h new/kdepim-runtime-4.14.4/agents/newmailnotifier/util.h --- old/kdepim-runtime-4.14.3/agents/newmailnotifier/util.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/agents/newmailnotifier/util.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -/* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#ifndef UTIL_H -#define UTIL_H - -#include <QPixmap> -#include <QString> - -namespace Akonadi { -class AgentInstance; -} - -namespace Util { -void showNotification(const QPixmap &pixmap, const QString &message); -QPixmap defaultPixmap(); -bool excludeAgentType(const Akonadi::AgentInstance &instance); -void testJovieService(); -} - -#endif // UTIL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/kcm/kcm_akonadi.desktop new/kdepim-runtime-4.14.4/kcm/kcm_akonadi.desktop --- old/kdepim-runtime-4.14.3/kcm/kcm_akonadi.desktop 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/kcm/kcm_akonadi.desktop 2015-01-07 13:28:41.000000000 +0100 @@ -91,7 +91,7 @@ Comment[nl]=Configuratie van het persoonlijke informatiebeheer raamwerk van Akonadi Comment[nn]=Oppsett av Akonadi-rammeverket for handtering av personleg informasjon Comment[pa]=ਅਕੌਂਡੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਪਰਬੰਧ ਫਰੇਮਵਰਕ ਦੀ ਸੰਰਚਨਾ -Comment[pl]=Ustawienia Akonadi - systemu zarządzania informacją osobistą +Comment[pl]=Ustawienia systemu do zarządzania informacjami osobistymi Akonadi Comment[pt]=Configuração da plataforma de Gestão de Informação Pessoal do Akonadi Comment[pt_BR]=Configuração da plataforma do gerenciador de informações pessoais do Akonadi Comment[ro]=Configurarea platformei de gestiune a informațiilor personale Akonadi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/kcm/kcm_akonadi_resources.desktop new/kdepim-runtime-4.14.4/kcm/kcm_akonadi_resources.desktop --- old/kdepim-runtime-4.14.3/kcm/kcm_akonadi_resources.desktop 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/kcm/kcm_akonadi_resources.desktop 2015-01-07 13:28:41.000000000 +0100 @@ -90,7 +90,7 @@ Comment[nl]=Configuratie van het persoonlijke informatiebeheer raamwerk van Akonadi Comment[nn]=Oppsett av Akonadi-rammeverket for handtering av personleg informasjon Comment[pa]=ਅਕੌਂਡੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਪਰਬੰਧ ਫਰੇਮਵਰਕ ਦੀ ਸੰਰਚਨਾ -Comment[pl]=Ustawienia Akonadi - systemu zarządzania informacją osobistą +Comment[pl]=Ustawienia systemu do zarządzania informacjami osobistymi Akonadi Comment[pt]=Configuração da plataforma de Gestão de Informação Pessoal do Akonadi Comment[pt_BR]=Configuração da plataforma do gerenciador de informações pessoais do Akonadi Comment[ro]=Configurarea platformei de gestiune a informațiilor personale Akonadi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/migration/knotes/knotesmigrator.cpp new/kdepim-runtime-4.14.4/migration/knotes/knotesmigrator.cpp --- old/kdepim-runtime-4.14.3/migration/knotes/knotesmigrator.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/migration/knotes/knotesmigrator.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,6 +1,6 @@ /* Copyright (c) 2008 Volker Krause <vkra...@kde.org> - Copyright (c) 2013 Laurent Montel <mon...@kde.org> + Copyright (c) 2013-2015 Laurent Montel <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/migration/knotes/knotesmigrator.h new/kdepim-runtime-4.14.4/migration/knotes/knotesmigrator.h --- old/kdepim-runtime-4.14.3/migration/knotes/knotesmigrator.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/migration/knotes/knotesmigrator.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,7 +1,7 @@ /* Copyright (c) 2008 Volker Krause <vkra...@kde.org> Copyright (c) 2010 Stephen Kelly <steve...@gmail.com> - Copyright (c) 2013 Laurent Montel <mon...@kde.org> + Copyright (c) 2013-2015 Laurent Montel <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/migration/knotes/knotesmigratorconfig.cpp new/kdepim-runtime-4.14.4/migration/knotes/knotesmigratorconfig.cpp --- old/kdepim-runtime-4.14.3/migration/knotes/knotesmigratorconfig.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/migration/knotes/knotesmigratorconfig.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/migration/knotes/knotesmigratorconfig.h new/kdepim-runtime-4.14.4/migration/knotes/knotesmigratorconfig.h --- old/kdepim-runtime-4.14.3/migration/knotes/knotesmigratorconfig.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/migration/knotes/knotesmigratorconfig.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/migration/knotes/main.cpp new/kdepim-runtime-4.14.4/migration/knotes/main.cpp --- old/kdepim-runtime-4.14.3/migration/knotes/main.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/migration/knotes/main.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/migration/knotes/notealarmattribute.cpp new/kdepim-runtime-4.14.4/migration/knotes/notealarmattribute.cpp --- old/kdepim-runtime-4.14.3/migration/knotes/notealarmattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/migration/knotes/notealarmattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as @@ -53,7 +53,8 @@ QByteArray NoteAlarmAttribute::type() const { - return "NoteAlarmAttribute"; + static const QByteArray sType( "NoteAlarmAttribute" ); + return sType; } void NoteAlarmAttribute::setDateTime(const KDateTime &dateTime) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/migration/knotes/notealarmattribute.h new/kdepim-runtime-4.14.4/migration/knotes/notealarmattribute.h --- old/kdepim-runtime-4.14.3/migration/knotes/notealarmattribute.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/migration/knotes/notealarmattribute.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/migration/knotes/notedisplayattribute.cpp new/kdepim-runtime-4.14.4/migration/knotes/notedisplayattribute.cpp --- old/kdepim-runtime-4.14.3/migration/knotes/notedisplayattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/migration/knotes/notedisplayattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as @@ -111,7 +111,8 @@ QByteArray NoteDisplayAttribute::type() const { - return "NoteDisplayAttribute"; + static const QByteArray sType( "NoteDisplayAttribute" ); + return sType; } void NoteDisplayAttribute::setBackgroundColor(const QColor &color) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/migration/knotes/notedisplayattribute.h new/kdepim-runtime-4.14.4/migration/knotes/notedisplayattribute.h --- old/kdepim-runtime-4.14.3/migration/knotes/notedisplayattribute.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/migration/knotes/notedisplayattribute.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/migration/knotes/notelockattribute.cpp new/kdepim-runtime-4.14.4/migration/knotes/notelockattribute.cpp --- old/kdepim-runtime-4.14.3/migration/knotes/notelockattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/migration/knotes/notelockattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -52,7 +52,8 @@ QByteArray NoteLockAttribute::type() const { //We can't change this name! - return "KJotsLockAttribute"; + static const QByteArray sType( "KJotsLockAttribute" ); + return sType; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/migration/knotes/showfoldernotesattribute.cpp new/kdepim-runtime-4.14.4/migration/knotes/showfoldernotesattribute.cpp --- old/kdepim-runtime-4.14.3/migration/knotes/showfoldernotesattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/migration/knotes/showfoldernotesattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/migration/knotes/showfoldernotesattribute.h new/kdepim-runtime-4.14.4/migration/knotes/showfoldernotesattribute.h --- old/kdepim-runtime-4.14.3/migration/knotes/showfoldernotesattribute.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/migration/knotes/showfoldernotesattribute.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/dav/resource/davprotocolattribute.cpp new/kdepim-runtime-4.14.4/resources/dav/resource/davprotocolattribute.cpp --- old/kdepim-runtime-4.14.3/resources/dav/resource/davprotocolattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/dav/resource/davprotocolattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -40,7 +40,8 @@ QByteArray DavProtocolAttribute::type() const { - return "davprotocol"; + static const QByteArray sType( "davprotocol" ); + return sType; } QByteArray DavProtocolAttribute::serialized() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/facebook/facebookresource.desktop new/kdepim-runtime-4.14.4/resources/facebook/facebookresource.desktop --- old/kdepim-runtime-4.14.3/resources/facebook/facebookresource.desktop 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/facebook/facebookresource.desktop 2015-01-07 13:28:41.000000000 +0100 @@ -62,7 +62,7 @@ Comment[nb]=Gjør dine Facebook-data tilgjengelige i KDE Comment[nds]=Maakt Dien Facebook-Daten binnen KDE verföögbor Comment[nl]=Maakt uw Facebook gegevens beschikbaar in KDE -Comment[pl]=Sprawia, że twoje dane z Facebook są dostępne w KDE +Comment[pl]=Umożliwia dostęp do danych Facebooka z KDE Comment[pt]=Disponibiliza os seus dados do Facebook no KDE Comment[pt_BR]=Disponibiliza os seus dados do Facebook no KDE Comment[ru]=Передаёт в KDE ваши данные Facebook diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/folderarchivesettings/folderarchiveaccountinfo.cpp new/kdepim-runtime-4.14.4/resources/folderarchivesettings/folderarchiveaccountinfo.cpp --- old/kdepim-runtime-4.14.3/resources/folderarchivesettings/folderarchiveaccountinfo.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/folderarchivesettings/folderarchiveaccountinfo.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/folderarchivesettings/folderarchiveaccountinfo.h new/kdepim-runtime-4.14.4/resources/folderarchivesettings/folderarchiveaccountinfo.h --- old/kdepim-runtime-4.14.3/resources/folderarchivesettings/folderarchiveaccountinfo.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/folderarchivesettings/folderarchiveaccountinfo.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/folderarchivesettings/folderarchivesettingpage.cpp new/kdepim-runtime-4.14.4/resources/folderarchivesettings/folderarchivesettingpage.cpp --- old/kdepim-runtime-4.14.3/resources/folderarchivesettings/folderarchivesettingpage.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/folderarchivesettings/folderarchivesettingpage.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/folderarchivesettings/folderarchivesettingpage.h new/kdepim-runtime-4.14.4/resources/folderarchivesettings/folderarchivesettingpage.h --- old/kdepim-runtime-4.14.3/resources/folderarchivesettings/folderarchivesettingpage.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/folderarchivesettings/folderarchivesettingpage.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/folderarchivesettings/folderarchiveutil.cpp new/kdepim-runtime-4.14.4/resources/folderarchivesettings/folderarchiveutil.cpp --- old/kdepim-runtime-4.14.3/resources/folderarchivesettings/folderarchiveutil.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/folderarchivesettings/folderarchiveutil.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/folderarchivesettings/folderarchiveutil.h new/kdepim-runtime-4.14.4/resources/folderarchivesettings/folderarchiveutil.h --- old/kdepim-runtime-4.14.3/resources/folderarchivesettings/folderarchiveutil.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/folderarchivesettings/folderarchiveutil.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/gmail/gmailresource.desktop new/kdepim-runtime-4.14.4/resources/gmail/gmailresource.desktop --- old/kdepim-runtime-4.14.3/resources/gmail/gmailresource.desktop 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/gmail/gmailresource.desktop 2015-01-07 13:28:41.000000000 +0100 @@ -24,6 +24,7 @@ Name[sr@ijekavianlatin]=GMail Name[sr@latin]=GMail Name[sv]=Gmail +Name[tr]=Gmail Name[uk]=Gmail Name[x-test]=xxGmailxx Name[zh_TW]=Gmail @@ -52,6 +53,7 @@ Comment[sr@ijekavianlatin]=Povezivanje sa nalogom na GMailu Comment[sr@latin]=Povezivanje sa nalogom na GMailu Comment[sv]=Ansluter till ditt Gmail-konto +Comment[tr]=Gmail hesabınıza bağlanır Comment[uk]=Встановлює з’єднання з вашим обліковим записом Gmail Comment[x-test]=xxConnects to your Gmail accountxx Comment[zh_TW]=連線到您的 Gmail 帳號 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/google/calendar/defaultreminderattribute.cpp new/kdepim-runtime-4.14.4/resources/google/calendar/defaultreminderattribute.cpp --- old/kdepim-runtime-4.14.3/resources/google/calendar/defaultreminderattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/google/calendar/defaultreminderattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -109,6 +109,7 @@ QByteArray DefaultReminderAttribute::type() const { - return "defaultReminders"; + static const QByteArray sType( "defaultReminders" ); + return sType; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/imap/highestmodseqattribute.cpp new/kdepim-runtime-4.14.4/resources/imap/highestmodseqattribute.cpp --- old/kdepim-runtime-4.14.3/resources/imap/highestmodseqattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/imap/highestmodseqattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -44,7 +44,8 @@ QByteArray HighestModSeqAttribute::type() const { - return "highestmodseq"; + static const QByteArray sType( "highestmodseq" ); + return sType; } void HighestModSeqAttribute::deserialize( const QByteArray &data ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/imap/imapresourcebase.h new/kdepim-runtime-4.14.4/resources/imap/imapresourcebase.h --- old/kdepim-runtime-4.14.3/resources/imap/imapresourcebase.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/imap/imapresourcebase.h 2015-01-07 13:28:41.000000000 +0100 @@ -62,7 +62,6 @@ virtual KDialog *createConfigureDialog( WId windowId ) = 0; - QStringList serverCapabilities() const; void cleanup(); virtual Settings* settings() const; @@ -73,6 +72,7 @@ // DBus methods Q_SCRIPTABLE void requestManualExpunge( qint64 collectionId ); Q_SCRIPTABLE int configureSubscription( qlonglong windowId = 0 ); + Q_SCRIPTABLE QStringList serverCapabilities() const; // pseudo-virtual called by ResourceBase QString dumpResourceToString() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/imap/noinferiorsattribute.cpp new/kdepim-runtime-4.14.4/resources/imap/noinferiorsattribute.cpp --- old/kdepim-runtime-4.14.3/resources/imap/noinferiorsattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/imap/noinferiorsattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -40,7 +40,8 @@ QByteArray NoInferiorsAttribute::type() const { - return "noinferiors"; + static const QByteArray sType( "noinferiors" ); + return sType; } Akonadi::Attribute* NoInferiorsAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/imap/noselectattribute.cpp new/kdepim-runtime-4.14.4/resources/imap/noselectattribute.cpp --- old/kdepim-runtime-4.14.3/resources/imap/noselectattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/imap/noselectattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -40,7 +40,8 @@ QByteArray NoSelectAttribute::type() const { - return "noselect"; + static const QByteArray sType( "noselect" ); + return sType; } Akonadi::Attribute* NoSelectAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/imap/serverinfodialog.cpp new/kdepim-runtime-4.14.4/resources/imap/serverinfodialog.cpp --- old/kdepim-runtime-4.14.3/resources/imap/serverinfodialog.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/imap/serverinfodialog.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/imap/serverinfodialog.h new/kdepim-runtime-4.14.4/resources/imap/serverinfodialog.h --- old/kdepim-runtime-4.14.3/resources/imap/serverinfodialog.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/imap/serverinfodialog.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/imap/timestampattribute.cpp new/kdepim-runtime-4.14.4/resources/imap/timestampattribute.cpp --- old/kdepim-runtime-4.14.3/resources/imap/timestampattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/imap/timestampattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -42,7 +42,8 @@ QByteArray TimestampAttribute::type() const { - return "timestamp"; + static const QByteArray sType( "timestamp" ); + return sType; } Akonadi::Attribute *TimestampAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/imap/uidnextattribute.cpp new/kdepim-runtime-4.14.4/resources/imap/uidnextattribute.cpp --- old/kdepim-runtime-4.14.3/resources/imap/uidnextattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/imap/uidnextattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -40,7 +40,8 @@ QByteArray UidNextAttribute::type() const { - return "uidnext"; + static const QByteArray sType( "uidnext" ); + return sType; } Akonadi::Attribute* UidNextAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/imap/uidvalidityattribute.cpp new/kdepim-runtime-4.14.4/resources/imap/uidvalidityattribute.cpp --- old/kdepim-runtime-4.14.3/resources/imap/uidvalidityattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/imap/uidvalidityattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -40,7 +40,8 @@ QByteArray UidValidityAttribute::type() const { - return "uidvalidity"; + static const QByteArray sType( "uidvalidity" ); + return sType; } Akonadi::Attribute* UidValidityAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/kolab/kolabresource.desktop new/kdepim-runtime-4.14.4/resources/kolab/kolabresource.desktop --- old/kdepim-runtime-4.14.3/resources/kolab/kolabresource.desktop 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/kolab/kolabresource.desktop 2015-01-07 13:28:41.000000000 +0100 @@ -69,6 +69,7 @@ Comment[sr@ijekavianlatin]=Omogućava pristup Kolabovim grupverskim fasciklama i e‑pošti na Kolabovom IMAP serveru. Comment[sr@latin]=Omogućava pristup Kolabovim grupverskim fasciklama i e‑pošti na Kolabovom IMAP serveru. Comment[sv]=Ger tillgång till Kolab grupprogramkorgar och e-post på en Kolab IMAP-server. +Comment[tr]=Bir Kolab IMAP Sunucusu üzerinde Kolab groupware klasörlerine ve epostaya erişim sağlar. Comment[uk]=Надає доступ до тек групової роботи та електронної пошти на серверів IMAP Kolab. Comment[x-test]=xxProvides access to Kolab groupware folders and e-mail on a Kolab IMAP Server.xx Comment[zh_TW]=提供存取某 Kolab IMAP 伺服器上的 Kolab 群組資料夾與電子郵件 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/kolabproxy/kolabproxyresource.desktop new/kdepim-runtime-4.14.4/resources/kolabproxy/kolabproxyresource.desktop --- old/kdepim-runtime-4.14.3/resources/kolabproxy/kolabproxyresource.desktop 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/kolabproxy/kolabproxyresource.desktop 2015-01-07 13:28:41.000000000 +0100 @@ -23,6 +23,7 @@ Name[sr@ijekavianlatin]=Kolabov grupverski server (zastarelo) Name[sr@latin]=Kolabov grupverski server (zastarelo) Name[sv]=Kolab grupprogramserver (föråldrad) +Name[tr]=Kolab Groupware Sunucusu (miras) Name[uk]=Сервер групової роботи Kolab (застаріле) Name[x-test]=xxKolab Groupware Server (legacy)xx Name[zh_TW]=Kolab 群組伺服器（傳統） @@ -50,6 +51,7 @@ Comment[sr@ijekavianlatin]=Omogućava pristup Kolabovim grupverskim fasciklama na IMAP serveru (IMAP nalozi se moraju odvojeno postaviti). Ovaj resurs je zastareo, koristite umesto njega resurs „Kolabov grupverski server“. Comment[sr@latin]=Omogućava pristup Kolabovim grupverskim fasciklama na IMAP serveru (IMAP nalozi se moraju odvojeno postaviti). Ovaj resurs je zastareo, koristite umesto njega resurs „Kolabov grupverski server“. Comment[sv]=Ger tillgång till Kolab grupprogramkorgar på en IMAP-server (IMAP-konton måste ställas in separat). Resursen är föråldrad, använd istället Kolab grupprogramserver. +Comment[tr]=Bir IMAP sunucusu üzerindeki Kolab groupware klasörlerine erişim sağlar (IMAP hesabı ayrıca ayarlanmalıdır). Bu kaynak artık kullanılmadığından onun yerine Kolab Groupware Sunucu kaynağını kullanın. Comment[uk]=Надає доступ до тек групової роботи Kolab на сервері IMAP (облікові записи IMAP слід налаштувати окремо). Цей ресурс вважається застарілим, замість нього слід використовувати ресурс сервера групової роботи Kolab. Comment[x-test]=xxProvides access to Kolab groupware folders on an IMAP server (IMAP accounts need to be set up separately). This resource is obsolete, use the Kolab Groupware Server resource instead.xx Comment[zh_TW]=提供存取某 IMAP 伺服器上的 Kolab 群組資料夾（IMAP 帳號要分別設定）。此資源已廢棄，請改用 Kolab 群組伺服器資源。 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/kolabproxy/setupkolab.cpp new/kdepim-runtime-4.14.4/resources/kolabproxy/setupkolab.cpp --- old/kdepim-runtime-4.14.3/resources/kolabproxy/setupkolab.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/kolabproxy/setupkolab.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2010 Laurent Montel <mon...@kde.org> + Copyright (c) 2010-2015 Laurent Montel <mon...@kde.org> Copyright (c) 2012 Christian Mollekopf <mollek...@kolabsys.com> This library is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/kolabproxy/setupkolab.h new/kdepim-runtime-4.14.4/resources/kolabproxy/setupkolab.h --- old/kdepim-runtime-4.14.3/resources/kolabproxy/setupkolab.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/kolabproxy/setupkolab.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2010 Laurent Montel <mon...@kde.org> + Copyright (c) 2010-2015 Laurent Montel <mon...@kde.org> Copyright (c) 2012 Christian Mollekopf <mollek...@kolabsys.com> This library is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/mbox/CMakeLists.txt new/kdepim-runtime-4.14.4/resources/mbox/CMakeLists.txt --- old/kdepim-runtime-4.14.3/resources/mbox/CMakeLists.txt 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/mbox/CMakeLists.txt 2015-01-07 13:28:41.000000000 +0100 @@ -42,3 +42,4 @@ target_link_libraries(akonadi_mbox_resource ${KDEPIMLIBS_KMBOX_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${QT_QTDBUS_LIBRARY} ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS}) install(TARGETS akonadi_mbox_resource DESTINATION ${PLUGIN_INSTALL_DIR}) +add_subdirectory(autotests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/mbox/autotests/CMakeLists.txt new/kdepim-runtime-4.14.4/resources/mbox/autotests/CMakeLists.txt --- old/kdepim-runtime-4.14.3/resources/mbox/autotests/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/mbox/autotests/CMakeLists.txt 2015-01-07 13:28:41.000000000 +0100 @@ -0,0 +1,5 @@ + +set( mbox_deleteitemsattributetest_source deleteitemsattributetest.cpp ../deleteditemsattribute.cpp) +kde4_add_unit_test( deleteitemsattributetest ${mbox_deleteitemsattributetest_source}) +target_link_libraries( deleteitemsattributetest ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_KMBOX_LIBS}) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/mbox/autotests/deleteitemsattributetest.cpp new/kdepim-runtime-4.14.4/resources/mbox/autotests/deleteitemsattributetest.cpp --- old/kdepim-runtime-4.14.3/resources/mbox/autotests/deleteitemsattributetest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/mbox/autotests/deleteitemsattributetest.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -0,0 +1,84 @@ +/* + Copyright (c) 2015 Montel Laurent <mon...@kde.org> + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include "deleteitemsattributetest.h" +#include "../deleteditemsattribute.h" +#include <qtest_kde.h> + + +DeleteItemsAttributeTest::DeleteItemsAttributeTest(QObject *parent) + : QObject(parent) +{ + +} + +DeleteItemsAttributeTest::~DeleteItemsAttributeTest() +{ + +} + +void DeleteItemsAttributeTest::shouldHaveDefaultValue() +{ + DeletedItemsAttribute attr; + QVERIFY(attr.deletedItemOffsets().isEmpty()); + QCOMPARE(attr.offsetCount(), 0); +} + +void DeleteItemsAttributeTest::shouldAssignValue() +{ + DeletedItemsAttribute attr; + QSet<quint64> lst; + lst.insert(15); + attr.addDeletedItemOffset(15); + lst.insert(154); + attr.addDeletedItemOffset(154); + lst.insert(225); + attr.addDeletedItemOffset(225); + QVERIFY(!attr.deletedItemOffsets().isEmpty()); + QCOMPARE(attr.offsetCount(), 3); + QCOMPARE(lst, attr.deletedItemOffsets()); +} + +void DeleteItemsAttributeTest::shouldDeserializeValue() +{ + DeletedItemsAttribute attr; + attr.addDeletedItemOffset(15); + attr.addDeletedItemOffset(154); + attr.addDeletedItemOffset(225); + const QByteArray ba = attr.serialized(); + DeletedItemsAttribute result; + result.deserialize(ba); + QVERIFY(result == attr); +} + +void DeleteItemsAttributeTest::shouldCloneAttribute() +{ + DeletedItemsAttribute attr; + attr.addDeletedItemOffset(15); + attr.addDeletedItemOffset(154); + attr.addDeletedItemOffset(225); + DeletedItemsAttribute *result = attr.clone(); + QVERIFY(*result == attr); +} + +void DeleteItemsAttributeTest::shouldHaveTypeName() +{ + DeletedItemsAttribute attr; + QCOMPARE(attr.type(), QByteArray("DeletedMboxItems")); +} + +QTEST_KDEMAIN(DeleteItemsAttributeTest, NoGUI) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/mbox/autotests/deleteitemsattributetest.h new/kdepim-runtime-4.14.4/resources/mbox/autotests/deleteitemsattributetest.h --- old/kdepim-runtime-4.14.3/resources/mbox/autotests/deleteitemsattributetest.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/mbox/autotests/deleteitemsattributetest.h 2015-01-07 13:28:41.000000000 +0100 @@ -0,0 +1,38 @@ +/* + Copyright (c) 2015 Montel Laurent <mon...@kde.org> + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#ifndef DELETEITEMSATTRIBUTETEST_H +#define DELETEITEMSATTRIBUTETEST_H + +#include <QObject> + +class DeleteItemsAttributeTest : public QObject +{ + Q_OBJECT +public: + explicit DeleteItemsAttributeTest(QObject *parent = 0); + ~DeleteItemsAttributeTest(); + +private Q_SLOTS: + void shouldHaveDefaultValue(); + void shouldDeserializeValue(); + void shouldAssignValue(); + void shouldCloneAttribute(); + void shouldHaveTypeName(); +}; + +#endif // DELETEITEMSATTRIBUTETEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/mbox/compactpage.cpp new/kdepim-runtime-4.14.4/resources/mbox/compactpage.cpp --- old/kdepim-runtime-4.14.3/resources/mbox/compactpage.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/mbox/compactpage.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -82,7 +82,7 @@ DeletedItemsAttribute *attr = mboxCollection.attribute<DeletedItemsAttribute>( Akonadi::Entity::AddIfMissing ); - if ( attr->deletedItemOffsets().size() > 0 ) { + if ( !attr->deletedItemOffsets().isEmpty() ) { ui.compactButton->setEnabled( true ); ui.messageLabel->setText( i18np( "(1 message marked for deletion)", "(%1 messages marked for deletion)", attr->deletedItemOffsets().size() ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/mbox/deleteditemsattribute.cpp new/kdepim-runtime-4.14.4/resources/mbox/deleteditemsattribute.cpp --- old/kdepim-runtime-4.14.3/resources/mbox/deleteditemsattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/mbox/deleteditemsattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -41,7 +41,7 @@ mDeletedItemOffsets.insert( offset ); } -Akonadi::Attribute *DeletedItemsAttribute::clone() const +DeletedItemsAttribute *DeletedItemsAttribute::clone() const { return new DeletedItemsAttribute( *this ); } @@ -92,5 +92,11 @@ QByteArray DeletedItemsAttribute::type() const { - return "DeletedMboxItems"; + static const QByteArray sType( "DeletedMboxItems" ); + return sType; +} + +bool DeletedItemsAttribute::operator==(const DeletedItemsAttribute &other) const +{ + return mDeletedItemOffsets == other.deletedItemOffsets(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/mbox/deleteditemsattribute.h new/kdepim-runtime-4.14.4/resources/mbox/deleteditemsattribute.h --- old/kdepim-runtime-4.14.3/resources/mbox/deleteditemsattribute.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/mbox/deleteditemsattribute.h 2015-01-07 13:28:41.000000000 +0100 @@ -26,7 +26,7 @@ #include <QtCore/QSet> /** - * This attribute stores a list of offdets in the mbox file of mails which are + * This attribute stores a list of offsets in the mbox file of mails which are * deleted but not yet actually removed from the file yet. */ class DeletedItemsAttribute : public Akonadi::Attribute @@ -40,7 +40,7 @@ void addDeletedItemOffset( quint64 ); - virtual Attribute *clone() const; + virtual DeletedItemsAttribute *clone() const; QSet<quint64> deletedItemOffsets() const; KMBox::MBoxEntry::List deletedItemEntries() const; @@ -56,7 +56,8 @@ virtual QByteArray type() const; - private: + bool operator ==(const DeletedItemsAttribute &other) const; +private: QSet<quint64> mDeletedItemOffsets; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/mbox/mboxresource.h new/kdepim-runtime-4.14.4/resources/mbox/mboxresource.h --- old/kdepim-runtime-4.14.3/resources/mbox/mboxresource.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/mbox/mboxresource.h 2015-01-07 13:28:41.000000000 +0100 @@ -61,7 +61,7 @@ void onCollectionModify( KJob *job ); private: - QMap<KJob*, Akonadi::Item> mCurrentItemDeletions; + QHash<KJob*, Akonadi::Item> mCurrentItemDeletions; KMBox::MBox *mMBox; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/nntp/nntpcollectionattribute.cpp new/kdepim-runtime-4.14.4/resources/nntp/nntpcollectionattribute.cpp --- old/kdepim-runtime-4.14.3/resources/nntp/nntpcollectionattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/nntp/nntpcollectionattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -29,7 +29,8 @@ QByteArray NntpCollectionAttribute::type() const { - return "NNTP"; + static const QByteArray sType( "NNTP" ); + return sType; } NntpCollectionAttribute * NntpCollectionAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/pop3/jobs.cpp new/kdepim-runtime-4.14.4/resources/pop3/jobs.cpp --- old/kdepim-runtime-4.14.3/resources/pop3/jobs.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/pop3/jobs.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -423,7 +423,7 @@ { } -void DeleteJob::setDeleteIds( const QList<int> ids ) +void DeleteJob::setDeleteIds(const QList<int> &ids ) { mIdsToDelete = ids; } @@ -458,7 +458,7 @@ { } -void FetchJob::setFetchIds( const QList<int> ids, QList<int> sizes ) +void FetchJob::setFetchIds( const QList<int> &ids, const QList<int> &sizes ) { mIdsPendingDownload = ids; foreach( int size, sizes ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/pop3/jobs.h new/kdepim-runtime-4.14.4/resources/pop3/jobs.h --- old/kdepim-runtime-4.14.3/resources/pop3/jobs.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/pop3/jobs.h 2015-01-07 13:28:41.000000000 +0100 @@ -157,7 +157,7 @@ Q_OBJECT public: DeleteJob( POPSession *popSession ); - void setDeleteIds( const QList<int> ids ); + void setDeleteIds( const QList<int> &ids ); virtual void start(); QList<int> deletedIDs() const; @@ -182,7 +182,7 @@ public: FetchJob( POPSession *session ); - void setFetchIds( const QList<int> ids, QList<int> sizes ); + void setFetchIds( const QList<int> &ids, const QList<int> &sizes ); virtual void start(); private slots: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/pop3/pop3resourceattribute.cpp new/kdepim-runtime-4.14.4/resources/pop3/pop3resourceattribute.cpp --- old/kdepim-runtime-4.14.3/resources/pop3/pop3resourceattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/pop3/pop3resourceattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/pop3/pop3resourceattribute.h new/kdepim-runtime-4.14.4/resources/pop3/pop3resourceattribute.h --- old/kdepim-runtime-4.14.3/resources/pop3/pop3resourceattribute.h 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/pop3/pop3resourceattribute.h 2015-01-07 13:28:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2013, 2014 Montel Laurent <mon...@kde.org> + Copyright (c) 2013-2015 Montel Laurent <mon...@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/shared/collectionannotationsattribute.cpp new/kdepim-runtime-4.14.4/resources/shared/collectionannotationsattribute.cpp --- old/kdepim-runtime-4.14.3/resources/shared/collectionannotationsattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/shared/collectionannotationsattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -46,7 +46,8 @@ QByteArray CollectionAnnotationsAttribute::type() const { - return "collectionannotations"; + static const QByteArray sType( "collectionannotations" ); + return sType; } Akonadi::Attribute* CollectionAnnotationsAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/shared/collectionflagsattribute.cpp new/kdepim-runtime-4.14.4/resources/shared/collectionflagsattribute.cpp --- old/kdepim-runtime-4.14.3/resources/shared/collectionflagsattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/shared/collectionflagsattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -41,7 +41,8 @@ QByteArray CollectionFlagsAttribute::type() const { - return "collectionflags"; + static const QByteArray sType( "collectionflags" ); + return sType; } Akonadi::Attribute* CollectionFlagsAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/shared/filestore/entitycompactchangeattribute.cpp new/kdepim-runtime-4.14.4/resources/shared/filestore/entitycompactchangeattribute.cpp --- old/kdepim-runtime-4.14.3/resources/shared/filestore/entitycompactchangeattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/shared/filestore/entitycompactchangeattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -81,7 +81,8 @@ QByteArray FileStore::EntityCompactChangeAttribute::type() const { - return "ENTITYCOMPACTCHANGE"; + static const QByteArray sType( "ENTITYCOMPACTCHANGE" ); + return sType; } FileStore::EntityCompactChangeAttribute* FileStore::EntityCompactChangeAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/shared/imapaclattribute.cpp new/kdepim-runtime-4.14.4/resources/shared/imapaclattribute.cpp --- old/kdepim-runtime-4.14.3/resources/shared/imapaclattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/shared/imapaclattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -51,7 +51,8 @@ QByteArray ImapAclAttribute::type() const { - return "imapacl"; + static const QByteArray sType( "imapacl" ); + return sType; } Akonadi::Attribute* ImapAclAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.3/resources/shared/imapquotaattribute.cpp new/kdepim-runtime-4.14.4/resources/shared/imapquotaattribute.cpp --- old/kdepim-runtime-4.14.3/resources/shared/imapquotaattribute.cpp 2014-11-04 08:55:43.000000000 +0100 +++ new/kdepim-runtime-4.14.4/resources/shared/imapquotaattribute.cpp 2015-01-07 13:28:41.000000000 +0100 @@ -69,7 +69,8 @@ QByteArray ImapQuotaAttribute::type() const { - return "imapquota"; + static const QByteArray sType( "imapquota" ); + return sType; } Akonadi::Attribute* ImapQuotaAttribute::clone() const -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
