diff -Nru kgpg-4.8.4/core/KGpgKeyNode.cpp kgpg-4.8.5/core/KGpgKeyNode.cpp --- kgpg-4.8.4/core/KGpgKeyNode.cpp 2012-06-01 12:33:17.882088363 +0000 +++ kgpg-4.8.5/core/KGpgKeyNode.cpp 2012-07-30 15:15:01.494037032 +0000 @@ -334,14 +334,16 @@ KGpgKeyNode::compareId(const QString &other) const { if (other.length() == m_key->fullId().length()) - return other.compare(m_key->fullId(), Qt::CaseInsensitive); + return (other.compare(m_key->fullId(), Qt::CaseInsensitive) == 0); if (other.length() == m_key->fingerprint().length()) - return other.compare(m_key->fingerprint(), Qt::CaseInsensitive); + return (other.compare(m_key->fingerprint(), Qt::CaseInsensitive) == 0); - return other.right(m_key->fullId().length()).compare( - m_key->fullId().right(other.length()), - Qt::CaseInsensitive); + const QString comId = m_key->fullId().isEmpty() ? m_key->fingerprint() : m_key->fullId(); + + return (other.right(comId.length()).compare( + comId.right(other.length()), + Qt::CaseInsensitive) == 0); } void diff -Nru kgpg-4.8.4/debian/changelog kgpg-4.8.5/debian/changelog --- kgpg-4.8.4/debian/changelog 2012-06-23 20:38:59.000000000 +0000 +++ kgpg-4.8.5/debian/changelog 2012-09-07 14:51:12.000000000 +0000 @@ -1,3 +1,9 @@ +kgpg (4:4.8.5-0ubuntu0.1) precise-proposed; urgency=low + + * New upstream bugfix release (LP: #1047417) + + -- Scott Kitterman Fri, 07 Sep 2012 16:51:11 +0200 + kgpg (4:4.8.4-0ubuntu0.1) precise-proposed; urgency=low * New upstream release. (LP: #1007798) diff -Nru kgpg-4.8.4/debian/control kgpg-4.8.5/debian/control --- kgpg-4.8.4/debian/control 2012-06-04 13:37:17.000000000 +0000 +++ kgpg-4.8.5/debian/control 2012-07-30 20:41:57.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Kubuntu Developers XSBC-Original-Maintainer: Jonathan Riddell -Build-Depends: kde-sc-dev-latest (>= 4:4.8.4), +Build-Depends: kde-sc-dev-latest (>= 4:4.8.5), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), kdelibs5-dev (>= 4:4.8.1), kdepimlibs5-dev (>= 4:4.8.1) Standards-Version: 3.9.2 Binary files /tmp/5JQ2gtWDAL/kgpg-4.8.4/doc/index.cache.bz2 and /tmp/fsdTA3gJ3m/kgpg-4.8.5/doc/index.cache.bz2 differ diff -Nru kgpg-4.8.4/encryptfolder.desktop kgpg-4.8.5/encryptfolder.desktop --- kgpg-4.8.4/encryptfolder.desktop 2012-01-10 14:18:52.680842212 +0000 +++ kgpg-4.8.5/encryptfolder.desktop 2012-07-30 15:15:01.494037032 +0000 @@ -60,7 +60,7 @@ Name[sv]=Arkivera och kryptera katalog Name[ta]=காப்பகம் மாற்றும் மறையாக்க அடைவு Name[th]=ทำแฟ้มจัดเก็บและเข้ารหัสโฟลเดอร์ -Name[tr]=Klasörü Arşivle & Şifrele +Name[tr]=Dizini Arşivle ve Şifrele Name[ug]=ئارخىپلاش ۋە قىسقۇچ شىفىرلاش Name[uk]=Зробити архів теки і зашифрувати Name[vi]=Đóng Gói & Mã Hóa Thư Mục diff -Nru kgpg-4.8.4/main.cpp kgpg-4.8.5/main.cpp --- kgpg-4.8.4/main.cpp 2012-06-01 12:33:17.887088320 +0000 +++ kgpg-4.8.5/main.cpp 2012-07-30 15:15:01.495037023 +0000 @@ -25,7 +25,7 @@ static const char description[] = I18N_NOOP("KGpg - simple gui for gpg\n\nKGpg was designed to make gpg very easy to use.\nI tried to make it as secure as possible.\nHope you enjoy it."); -static const char version[] = "2.7.3"; +static const char version[] = "2.7.4"; int main(int argc, char *argv[]) { diff -Nru kgpg-4.8.4/model/kgpgitemmodel.cpp kgpg-4.8.5/model/kgpgitemmodel.cpp --- kgpg-4.8.4/model/kgpgitemmodel.cpp 2012-06-01 12:33:17.887088320 +0000 +++ kgpg-4.8.5/model/kgpgitemmodel.cpp 2012-07-30 15:15:01.495037023 +0000 @@ -343,8 +343,12 @@ emit dataChanged(createIndex(odefrow, 0, nd), createIndex(odefrow, lastcol, nd)); } - m_default = def->getId(); - emit dataChanged(createIndex(defrow, 0, def), createIndex(defrow, lastcol, def)); + if (def) { + m_default = def->getId(); + emit dataChanged(createIndex(defrow, 0, def), createIndex(defrow, lastcol, def)); + } else { + m_default.clear(); + } } QModelIndex diff -Nru kgpg-4.8.4/selectexpirydate.cpp kgpg-4.8.5/selectexpirydate.cpp --- kgpg-4.8.4/selectexpirydate.cpp 2011-08-22 13:26:11.375060638 +0000 +++ kgpg-4.8.5/selectexpirydate.cpp 2012-07-30 15:15:01.520036784 +0000 @@ -31,6 +31,7 @@ QWidget *page = new QWidget(this); m_unlimited = new QCheckBox(i18nc("Key has unlimited lifetime", "Unlimited"), page); + m_unlimited->setChecked(date.isNull()); if (date.isNull()) date = QDateTime::currentDateTime(); @@ -52,6 +53,8 @@ setMainWidget(page); show(); + + slotEnableDate(m_unlimited->isChecked()); } QDateTime SelectExpiryDate::date() const diff -Nru kgpg-4.8.4/transactions/kgpgkeyserversearchtransaction.cpp kgpg-4.8.5/transactions/kgpgkeyserversearchtransaction.cpp --- kgpg-4.8.4/transactions/kgpgkeyserversearchtransaction.cpp 2011-08-22 13:26:11.393060465 +0000 +++ kgpg-4.8.5/transactions/kgpgkeyserversearchtransaction.cpp 2012-07-30 15:15:01.533036662 +0000 @@ -62,6 +62,15 @@ } void +KGpgKeyserverSearchTransaction::finish() +{ + if (!m_keyLines.isEmpty()) { + emit newKey(m_keyLines); + m_keyLines.clear(); + } +} + +void KGpgKeyserverSearchTransaction::setPattern(const QString &pattern) { replaceArgument(m_patternPos, pattern); diff -Nru kgpg-4.8.4/transactions/kgpgkeyserversearchtransaction.h kgpg-4.8.5/transactions/kgpgkeyserversearchtransaction.h --- kgpg-4.8.4/transactions/kgpgkeyserversearchtransaction.h 2011-08-22 13:26:11.393060465 +0000 +++ kgpg-4.8.5/transactions/kgpgkeyserversearchtransaction.h 2012-07-30 15:15:01.533036662 +0000 @@ -59,6 +59,7 @@ protected: virtual bool preStart(); virtual bool nextLine(const QString &line); + virtual void finish(); private: QStringList m_keyLines; ///< the lines belonging to one key