Hello community, here is the log from the commit of package kgpg for openSUSE:Factory checked in at 2014-03-18 16:19:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-20 07:56:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kgpg.new/kgpg.changes 2014-03-18 16:19:48.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Mar 14 16:11:52 UTC 2014 - [email protected] + +- Kgpg can operate without kdepim4-runtime, so make it a Recommends + instead of requires + +------------------------------------------------------------------- +Thu Mar 13 20:21:58 UTC 2014 - [email protected] + +- Update to 4.12.90 + * KDE 4.13 Beta 2 release + * See http://www.kde.org/announcements/announce-4.13-beta2.php + +------------------------------------------------------------------- +Fri Mar 7 10:13:56 UTC 2014 - [email protected] + +- Update to 4.12.80 + * KDE 4.13 Beta 1 release + * See http://www.kde.org/announcements/announce-4.13-beta1.php + +------------------------------------------------------------------- Old: ---- kgpg-4.12.2.tar.xz New: ---- kgpg-4.12.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgpg.spec ++++++ --- /var/tmp/diff_new_pack.IOiLYq/_old 2014-03-18 16:19:49.000000000 +0100 +++ /var/tmp/diff_new_pack.IOiLYq/_new 2014-03-18 16:19:49.000000000 +0100 @@ -17,7 +17,7 @@ Name: kgpg -Version: 4.12.2 +Version: 4.12.90 Release: 0 Summary: Encryption Tool License: GPL-2.0+ @@ -28,7 +28,7 @@ BuildRequires: libkdepimlibs4-devel BuildRequires: xz Requires: gpg2 -Requires: kdepim4-runtime +Recommends: kdepim4-runtime BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires ++++++ kgpg-4.12.2.tar.xz -> kgpg-4.12.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.12.2/core/KGpgRefNode.cpp new/kgpg-4.12.90/core/KGpgRefNode.cpp --- old/kgpg-4.12.2/core/KGpgRefNode.cpp 2014-01-12 07:40:00.000000000 +0100 +++ new/kgpg-4.12.90/core/KGpgRefNode.cpp 2014-02-11 13:59:57.000000000 +0100 @@ -115,7 +115,7 @@ KGpgRefNode::getId() const { if (m_keynode != NULL) - return m_keynode->getId(); + return m_keynode->getFingerprint(); else return m_id; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.12.2/keyinfodialog.cpp new/kgpg-4.12.90/keyinfodialog.cpp --- old/kgpg-4.12.2/keyinfodialog.cpp 2014-01-12 07:40:00.000000000 +0100 +++ new/kgpg-4.12.90/keyinfodialog.cpp 2014-02-11 13:59:57.000000000 +0100 @@ -104,7 +104,8 @@ keychange(new KGpgChangeKey(node, this)), m_node(node), m_model(model), - m_keywaschanged(false) + m_keywaschanged(false), + m_closewhendone(false) { Q_ASSERT(m_model != NULL); Q_ASSERT(m_node != NULL); @@ -133,9 +134,6 @@ connect(m_owtrust, SIGNAL(activated(int)), this, SLOT(slotChangeTrust(int))); connect(m_photoid, SIGNAL(activated(QString)), this, SLOT(slotLoadPhoto(QString))); connect(m_email, SIGNAL(leftClickedUrl(QString)), this, SLOT(slotOpenUrl(QString))); - connect(this, SIGNAL(okClicked()), this, SLOT(slotPreOk())); - connect(this, SIGNAL(cancelClicked()), this, SLOT(slotPreCancel())); - connect(this, SIGNAL(applyClicked()), SLOT(slotApply())); connect(keychange, SIGNAL(done(int)), SLOT(slotApplied(int))); connect(m_disable, SIGNAL(toggled(bool)), this, SLOT(slotDisableKey(bool))); connect(m_expirationbtn, SIGNAL(clicked()), this, SLOT(slotChangeDate())); @@ -269,16 +267,6 @@ m_photo->setPixmap(pixmap); } -void KgpgKeyInfo::slotPreOk() -{ - if (m_keywaschanged && m_node) - emit keyNeedsRefresh(m_node); - keychange->setParentWidget(parentWidget()); - keychange->selfdestruct(true); - keychange = NULL; - accept(); -} - void KgpgKeyInfo::slotChangeDate() { QPointer<SelectExpiryDate> dialog = new SelectExpiryDate(this, m_node->getExpiration()); @@ -348,10 +336,24 @@ QApplication::setOverrideCursor(QCursor(Qt::BusyCursor)); } -void KgpgKeyInfo::slotApply() +void KgpgKeyInfo::slotButtonClicked(int button) { - setControlEnable(false); - keychange->apply(); + switch (button) { + case Ok: + m_closewhendone = true; + // Fall-through + case Apply: + setControlEnable(false); + keychange->apply(); + break; + case Cancel: + if (m_keywaschanged && m_node) + emit keyNeedsRefresh(m_node); + reject(); + break; + default: + KDialog::slotButtonClicked(button); + } } void KgpgKeyInfo::slotApplied(int result) @@ -360,16 +362,14 @@ KMessageBox::error(this, i18n("Changing key properties failed."), i18n("Key properties")); } else { m_keywaschanged = true; + if (m_node) + emit keyNeedsRefresh(m_node); reloadNode(); } setControlEnable(true); -} -void KgpgKeyInfo::slotPreCancel() -{ - if (m_keywaschanged && m_node) - emit keyNeedsRefresh(m_node); - reject(); + if (m_closewhendone) + accept(); } void KgpgKeyInfo::slotKeyExpanded() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.12.2/keyinfodialog.h new/kgpg-4.12.90/keyinfodialog.h --- old/kgpg-4.12.2/keyinfodialog.h 2014-01-12 07:40:00.000000000 +0100 +++ new/kgpg-4.12.90/keyinfodialog.h 2014-02-11 13:59:57.000000000 +0100 @@ -75,6 +75,9 @@ signals: void keyNeedsRefresh(KGpgKeyNode *node); +protected slots: + void slotButtonClicked(int button); + private: void reloadKey(); void reloadNode(); @@ -82,8 +85,6 @@ void setControlEnable(const bool &b); private slots: - void slotPreOk(); - void slotPreCancel(); void slotOpenUrl(const QString &url) const; void slotChangeDate(); @@ -97,7 +98,6 @@ void slotLoadPhoto(const QString &uid); - void slotApply(); void slotApplied(int result); void slotKeyExpanded(); @@ -109,6 +109,7 @@ KgpgTrustLabel *m_trust; bool m_keywaschanged; + bool m_closewhendone; }; #endif // KGPGKEYINFODIALOG_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.12.2/keysmanager.cpp new/kgpg-4.12.90/keysmanager.cpp --- old/kgpg-4.12.2/keysmanager.cpp 2014-01-12 07:40:00.000000000 +0100 +++ new/kgpg-4.12.90/keysmanager.cpp 2014-02-11 13:59:57.000000000 +0100 @@ -2429,6 +2429,38 @@ } else if ((pt == ITYPE_UID) && (ndlist.count() == 1)) { slotDelUid(); return; + } else if ((pt & ITYPE_GROUP) && !(pt & ~ITYPE_GPAIR)) { + bool invalidDelete = false; + foreach (const KGpgNode *nd, ndlist) + if (nd->getType() == ITYPE_GROUP) { + invalidDelete = true; + break; + } + + // only allow removing group members if they belong to the same group + if (!invalidDelete) { + const KGpgNode * const group = ndlist.first()->getParentKeyNode(); + foreach (const KGpgNode *nd, ndlist) + if (nd->getParentKeyNode() != group) { + invalidDelete = true; + break; + } + } + + if (!invalidDelete) { + KGpgGroupNode *gnd = ndlist.first()->getParentKeyNode()->toGroupNode(); + + QList<KGpgNode *> members = gnd->getChildren(); + + foreach (KGpgNode *nd, ndlist) { + int r = members.removeAll(nd); + Q_ASSERT(r == 1); + Q_UNUSED(r); + } + + imodel->changeGroup(gnd, members); + return; + } } if (pt & ~ITYPE_PAIR) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.12.2/main.cpp new/kgpg-4.12.90/main.cpp --- old/kgpg-4.12.2/main.cpp 2014-01-12 07:40:00.000000000 +0100 +++ new/kgpg-4.12.90/main.cpp 2014-02-11 13:59:57.000000000 +0100 @@ -23,7 +23,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.11.0"; +static const char version[] = "2.11.40"; int main(int argc, char *argv[]) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.12.2/model/groupeditproxymodel.cpp new/kgpg-4.12.90/model/groupeditproxymodel.cpp --- old/kgpg-4.12.2/model/groupeditproxymodel.cpp 2014-01-12 07:40:00.000000000 +0100 +++ new/kgpg-4.12.90/model/groupeditproxymodel.cpp 2014-02-11 13:59:57.000000000 +0100 @@ -112,7 +112,7 @@ return nd->getEmail(); case 2: if (role == Qt::ToolTipRole) - return nd->getId(); + return nd->toKeyNode()->getBeautifiedFingerprint(); else return nd->getId().right(8); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.12.2/model/kgpgitemmodel.cpp new/kgpg-4.12.90/model/kgpgitemmodel.cpp --- old/kgpg-4.12.2/model/kgpgitemmodel.cpp 2014-01-12 07:40:00.000000000 +0100 +++ new/kgpg-4.12.90/model/kgpgitemmodel.cpp 2014-02-11 13:59:57.000000000 +0100 @@ -309,8 +309,8 @@ for (int i = node->getChildCount() - 1; i >= 0; i--) { bool found = false; - for (int j = 0; j < keys.count(); j++) { - found = (node->getChild(i)->getId() == keys.at(j)->getId()); + foreach (const KGpgNode *nd, keys) { + found = (node->getChild(i)->getId() == nd->getId()); if (found) break; } @@ -326,8 +326,9 @@ for (int i = 0; i < keys.count(); i++) { bool found = false; - for (int j = 0; j < cnt; j++) { - found = (node->getChild(j)->getId() == keys.at(i)->getId()); + + foreach (const KGpgNode *nd, node->getChildren()) { + found = (nd->getId() == keys.at(i)->getId()); if (found) break; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
