Hello community, here is the log from the commit of package kgpg for openSUSE:Factory checked in at 2014-11-19 20:26:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kgpg (Old) and /work/SRC/openSUSE:Factory/.kgpg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kgpg" Changes: -------- --- /work/SRC/openSUSE:Factory/kgpg/kgpg.changes 2014-10-16 18:13:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kgpg.new/kgpg.changes 2014-11-19 20:30:06.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Nov 9 20:41:48 UTC 2014 - [email protected] + +- Update to 4.14.3 + * KDE 4.14.3 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.3.php + +------------------------------------------------------------------- Old: ---- kgpg-4.14.2.tar.xz New: ---- kgpg-4.14.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgpg.spec ++++++ --- /var/tmp/diff_new_pack.kKw34O/_old 2014-11-19 20:30:08.000000000 +0100 +++ /var/tmp/diff_new_pack.kKw34O/_new 2014-11-19 20:30:08.000000000 +0100 @@ -17,7 +17,7 @@ Name: kgpg -Version: 4.14.2 +Version: 4.14.3 Release: 0 Summary: Encryption Tool License: GPL-2.0+ ++++++ kgpg-4.14.2.tar.xz -> kgpg-4.14.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.2/core/convert.cpp new/kgpg-4.14.3/core/convert.cpp --- old/kgpg-4.14.2/core/convert.cpp 2014-10-09 18:21:21.000000000 +0200 +++ new/kgpg-4.14.3/core/convert.cpp 2014-10-19 22:56:06.000000000 +0200 @@ -34,16 +34,21 @@ QString toString(const KgpgKeyAlgo algorithm) { - switch (algorithm) - { - case ALGO_RSA: return i18nc("Encryption algorithm", "RSA"); - case ALGO_DSA: return i18nc("Encryption algorithm", "DSA"); - case ALGO_ELGAMAL: return i18nc("Encryption algorithm", "ElGamal"); - case ALGO_DSA_ELGAMAL: return i18nc("Encryption algorithm", "DSA & ElGamal"); - case ALGO_RSA_RSA: return i18nc("Encryption algorithm RSA, Signing algorithm RSA", "RSA & RSA"); - case ALGO_UNKNOWN: - default: return i18nc("Unknown algorithm", "Unknown"); - } + switch (algorithm) { + case ALGO_RSA: + return i18nc("Encryption algorithm", "RSA"); + case ALGO_DSA: + return i18nc("Encryption algorithm", "DSA"); + case ALGO_ELGAMAL: + return i18nc("Encryption algorithm", "ElGamal"); + case ALGO_DSA_ELGAMAL: + return i18nc("Encryption algorithm", "DSA & ElGamal"); + case ALGO_RSA_RSA: + return i18nc("Encryption algorithm RSA, Signing algorithm RSA", "RSA & RSA"); + case ALGO_UNKNOWN: + default: + return i18nc("Unknown algorithm", "Unknown"); + } } QString toString(const gpgme_validity_t ownertrust) @@ -67,20 +72,29 @@ QString toString(const KgpgKeyTrust trust) { - switch (trust) - { - case TRUST_INVALID: return i18nc("Invalid key", "Invalid"); - case TRUST_DISABLED: return i18nc("Disabled key", "Disabled"); - case TRUST_REVOKED: return i18n("Revoked"); - case TRUST_EXPIRED: return i18nc("Expired key", "Expired"); - case TRUST_UNDEFINED: return i18nc("Undefined key trust", "Undefined"); - case TRUST_NONE: return i18nc("No trust in key", "None"); - case TRUST_MARGINAL: return i18nc("Marginal trust in key", "Marginal"); - case TRUST_FULL: return i18nc("Full trust in key", "Full"); - case TRUST_ULTIMATE: return i18nc("Ultimate trust in key", "Ultimate"); - case TRUST_UNKNOWN: - default: return i18nc("Unknown trust in key", "Unknown"); - } + switch (trust) { + case TRUST_INVALID: + return i18nc("Invalid key", "Invalid"); + case TRUST_DISABLED: + return i18nc("Disabled key", "Disabled"); + case TRUST_REVOKED: + return i18n("Revoked"); + case TRUST_EXPIRED: + return i18nc("Expired key", "Expired"); + case TRUST_UNDEFINED: + return i18nc("Undefined key trust", "Undefined"); + case TRUST_NONE: + return i18nc("No trust in key", "None"); + case TRUST_MARGINAL: + return i18nc("Marginal trust in key", "Marginal"); + case TRUST_FULL: + return i18nc("Full trust in key", "Full"); + case TRUST_ULTIMATE: + return i18nc("Ultimate trust in key", "Ultimate"); + case TRUST_UNKNOWN: + default: + return i18nc("Unknown trust in key", "Unknown"); + } } QString toString(const KgpgCore::KgpgSubKeyType type) @@ -123,20 +137,30 @@ KgpgKeyTrust toTrust(const QChar &c) { - switch (c.toAscii()) - { - case 'o': return TRUST_UNKNOWN; - case 'i': return TRUST_INVALID; - case 'd': return TRUST_DISABLED; - case 'r': return TRUST_REVOKED; - case 'e': return TRUST_EXPIRED; - case 'q': return TRUST_UNDEFINED; - case 'n': return TRUST_NONE; - case 'm': return TRUST_MARGINAL; - case 'f': return TRUST_FULL; - case 'u': return TRUST_ULTIMATE; - default: return TRUST_UNKNOWN; - } + switch (c.toAscii()) { + case 'o': + return TRUST_UNKNOWN; + case 'i': + return TRUST_INVALID; + case 'd': + return TRUST_DISABLED; + case 'r': + return TRUST_REVOKED; + case 'e': + return TRUST_EXPIRED; + case 'q': + return TRUST_UNDEFINED; + case 'n': + return TRUST_NONE; + case 'm': + return TRUST_MARGINAL; + case 'f': + return TRUST_FULL; + case 'u': + return TRUST_ULTIMATE; + default: + return TRUST_UNKNOWN; + } } KgpgKeyTrust toTrust(const QString &s) @@ -166,36 +190,36 @@ foreach (const QChar &ch, capString) { switch (ch.toAscii()) { - case 's': - case 'S': - if (upper != ch.isUpper()) - continue; - ret |= SKT_SIGNATURE; - break; - case 'e': - case 'E': - if (upper != ch.isUpper()) - continue; - ret |= SKT_ENCRYPTION; - break; - case 'a': - case 'A': - if (upper != ch.isUpper()) - continue; - ret |= SKT_AUTHENTICATION; - break; - case 'c': - case 'C': - if (upper != ch.isUpper()) - continue; - ret |= SKT_CERTIFICATION; - break; - case 'D': // disabled key - case '?': // unknown to GnuPG + case 's': + case 'S': + if (upper != ch.isUpper()) + continue; + ret |= SKT_SIGNATURE; + break; + case 'e': + case 'E': + if (upper != ch.isUpper()) + continue; + ret |= SKT_ENCRYPTION; + break; + case 'a': + case 'A': + if (upper != ch.isUpper()) + continue; + ret |= SKT_AUTHENTICATION; + break; + case 'c': + case 'C': + if (upper != ch.isUpper()) continue; - default: - kDebug(2100) << "unknown capability letter" << ch - << "in cap string" << capString; + ret |= SKT_CERTIFICATION; + break; + case 'D': // disabled key + case '?': // unknown to GnuPG + continue; + default: + kDebug(2100) << "unknown capability letter" << ch + << "in cap string" << capString; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.2/groupedit.cpp new/kgpg-4.14.3/groupedit.cpp --- old/kgpg-4.14.2/groupedit.cpp 2014-10-09 18:21:21.000000000 +0200 +++ new/kgpg-4.14.3/groupedit.cpp 2014-10-19 22:56:06.000000000 +0200 @@ -42,7 +42,7 @@ textLabelAvailable->setText(i18n("Available Trusted Keys")); } - m_in = new GroupEditProxyModel(this, false, members, mintrust); + m_in = new GroupEditProxyModel(this, false, members, KgpgCore::TRUST_MINIMUM); m_in->setKeyModel(md); m_out = new GroupEditProxyModel(this, true, members, mintrust); m_out->setKeyModel(md); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.2/keyinfodialog.cpp new/kgpg-4.14.3/keyinfodialog.cpp --- old/kgpg-4.14.2/keyinfodialog.cpp 2014-10-09 18:21:21.000000000 +0200 +++ new/kgpg-4.14.3/keyinfodialog.cpp 2014-10-19 22:56:06.000000000 +0200 @@ -222,29 +222,24 @@ m_comment->setTextFormat(Qt::PlainText); } - switch (key->ownerTrust()) - { - case GPGME_VALIDITY_NEVER: - m_owtrust->setCurrentIndex(1); - break; - - case GPGME_VALIDITY_MARGINAL: - m_owtrust->setCurrentIndex(2); - break; - - case GPGME_VALIDITY_FULL: - m_owtrust->setCurrentIndex(3); - break; - - case GPGME_VALIDITY_ULTIMATE: - m_owtrust->setCurrentIndex(4); - break; - - case GPGME_VALIDITY_UNDEFINED: - default: - m_owtrust->setCurrentIndex(0); - break; - } + switch (key->ownerTrust()) { + case GPGME_VALIDITY_NEVER: + m_owtrust->setCurrentIndex(1); + break; + case GPGME_VALIDITY_MARGINAL: + m_owtrust->setCurrentIndex(2); + break; + case GPGME_VALIDITY_FULL: + m_owtrust->setCurrentIndex(3); + break; + case GPGME_VALIDITY_ULTIMATE: + m_owtrust->setCurrentIndex(4); + break; + case GPGME_VALIDITY_UNDEFINED: + default: + m_owtrust->setCurrentIndex(0); + break; + } if (!key->valid()) m_disable->setChecked(true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.2/model/groupeditproxymodel.cpp new/kgpg-4.14.3/model/groupeditproxymodel.cpp --- old/kgpg-4.14.2/model/groupeditproxymodel.cpp 2014-10-09 18:21:21.000000000 +0200 +++ new/kgpg-4.14.3/model/groupeditproxymodel.cpp 2014-10-19 22:56:06.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2008,2010,2012,2013 Rolf Eike Beer <[email protected]> +/* Copyright 2008,2010,2012,2013,2014 Rolf Eike Beer <[email protected]> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -22,6 +22,8 @@ #include "core/kgpgkey.h" #include <KDebug> +#include <KLocale> +#include <QIcon> using namespace KgpgCore; @@ -41,13 +43,6 @@ setSourceModel(md); } -void -GroupEditProxyModel::setMinTrust(const KgpgCore::KgpgKeyTrust mintrust) -{ - m_mintrust = mintrust; - invalidate(); -} - bool GroupEditProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const { @@ -98,23 +93,39 @@ if (!index.isValid() || (index.column() >= 3)) return QVariant(); - if ((role != Qt::ToolTipRole) && (role != Qt::DisplayRole)) - return QVariant(); - KGpgNode *nd = m_model->nodeForIndex(mapToSource(index)); - switch (index.column()) { + + switch (role) { + case Qt::ToolTipRole: + case Qt::DisplayRole: + switch (index.column()) { case 0: if (role == Qt::ToolTipRole) return nd->getNameComment(); else return nd->getName(); case 1: - return nd->getEmail(); + if (role == Qt::ToolTipRole) { + if (nd->toKeyNode()->getExpiration().isValid() && (nd->toKeyNode()->getExpiration() <= QDateTime::currentDateTime())) + return i18nc("Expired key", "Expired"); + break; + } else { + return nd->getEmail(); + } case 2: if (role == Qt::ToolTipRole) return nd->toKeyNode()->getBeautifiedFingerprint(); else return nd->getId().right(8); + default: + break; + } + case Qt::DecorationRole: + if (index.column() != 1) + break; + + if (nd->toKeyNode()->getExpiration().isValid() && (nd->toKeyNode()->getExpiration() <= QDateTime::currentDateTime())) + return QIcon::fromTheme(QLatin1String("dialog-warning")); } return QVariant(); @@ -143,9 +154,13 @@ return QVariant(); switch (section) { - case 0: return m_model->headerData(KEYCOLUMN_NAME, orientation, role); - case 1: return m_model->headerData(KEYCOLUMN_EMAIL, orientation, role); - case 2: return m_model->headerData(KEYCOLUMN_ID, orientation, role); - default: return QVariant(); + case 0: + return m_model->headerData(KEYCOLUMN_NAME, orientation, role); + case 1: + return m_model->headerData(KEYCOLUMN_EMAIL, orientation, role); + case 2: + return m_model->headerData(KEYCOLUMN_ID, orientation, role); + default: + return QVariant(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.2/model/groupeditproxymodel.h new/kgpg-4.14.3/model/groupeditproxymodel.h --- old/kgpg-4.14.2/model/groupeditproxymodel.h 2014-10-09 18:21:21.000000000 +0200 +++ new/kgpg-4.14.3/model/groupeditproxymodel.h 2014-10-19 22:56:06.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright 2008 Rolf Eike Beer <[email protected]> +/* Copyright 2008,2014 Rolf Eike Beer <[email protected]> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -32,7 +32,6 @@ explicit GroupEditProxyModel(QObject * parent, const bool invert, QList<KGpgNode *> *ids, const KgpgCore::KgpgKeyTrust mintrust = KgpgCore::TRUST_FULL); void setKeyModel(KGpgItemModel *); - void setMinTrust(const KgpgCore::KgpgKeyTrust mintrust); KGpgNode *nodeForIndex(const QModelIndex &index) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.14.2/model/selectkeyproxymodel.cpp new/kgpg-4.14.3/model/selectkeyproxymodel.cpp --- old/kgpg-4.14.2/model/selectkeyproxymodel.cpp 2014-10-09 18:21:21.000000000 +0200 +++ new/kgpg-4.14.3/model/selectkeyproxymodel.cpp 2014-10-19 22:56:06.000000000 +0200 @@ -149,10 +149,14 @@ return QVariant(); switch (section) { - case 0: return m_model->headerData(KEYCOLUMN_NAME, orientation, role); - case 1: return m_model->headerData(KEYCOLUMN_EMAIL, orientation, role); - case 2: return m_model->headerData(KEYCOLUMN_ID, orientation, role); - default: return QVariant(); + case 0: + return m_model->headerData(KEYCOLUMN_NAME, orientation, role); + case 1: + return m_model->headerData(KEYCOLUMN_EMAIL, orientation, role); + case 2: + return m_model->headerData(KEYCOLUMN_ID, orientation, role); + default: + return QVariant(); } } @@ -254,10 +258,15 @@ return QVariant(); switch (section) { - case 0: return m_model->headerData(KEYCOLUMN_NAME, orientation, role); - case 1: return m_model->headerData(KEYCOLUMN_EMAIL, orientation, role); - case 2: return m_model->headerData(KEYCOLUMN_EXPIR, orientation, role); - case 3: return m_model->headerData(KEYCOLUMN_ID, orientation, role); - default: return QVariant(); + case 0: + return m_model->headerData(KEYCOLUMN_NAME, orientation, role); + case 1: + return m_model->headerData(KEYCOLUMN_EMAIL, orientation, role); + case 2: + return m_model->headerData(KEYCOLUMN_EXPIR, orientation, role); + case 3: + return m_model->headerData(KEYCOLUMN_ID, orientation, role); + default: + return QVariant(); } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
