Hello community, here is the log from the commit of package kgpg for openSUSE:Factory checked in at 2013-12-19 13:17:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-12-11 14:34:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kgpg.new/kgpg.changes 2013-12-19 13:17:44.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Dec 14 18:10:51 UTC 2013 - [email protected] + +- Update to 4.12.0 + * KDE 4.12.0 release + * See http://www.kde.org/announcements/4.12.php + +------------------------------------------------------------------- Old: ---- kgpg-4.11.97.tar.xz New: ---- kgpg-4.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgpg.spec ++++++ --- /var/tmp/diff_new_pack.pErQk6/_old 2013-12-19 13:17:44.000000000 +0100 +++ /var/tmp/diff_new_pack.pErQk6/_new 2013-12-19 13:17:44.000000000 +0100 @@ -17,7 +17,7 @@ Name: kgpg -Version: 4.11.97 +Version: 4.12.0 Release: 0 Summary: Encryption Tool License: GPL-2.0+ ++++++ kgpg-4.11.97.tar.xz -> kgpg-4.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.11.97/keysmanager.cpp new/kgpg-4.12.0/keysmanager.cpp --- old/kgpg-4.11.97/keysmanager.cpp 2013-11-27 03:00:02.000000000 +0100 +++ new/kgpg-4.12.0/keysmanager.cpp 2013-12-11 20:12:14.000000000 +0100 @@ -1082,6 +1082,7 @@ if (terminalkey) editKey->setEnabled(false); m_sendEmail->setEnabled(!exportList[0]->getEmail().isEmpty()); + setDefaultKey->setEnabled(!imodel->isDefaultKey(exportList[0])); } break; default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.11.97/kgpg.cpp new/kgpg-4.12.0/kgpg.cpp --- old/kgpg-4.11.97/kgpg.cpp 2013-11-27 03:00:02.000000000 +0100 +++ new/kgpg-4.12.0/kgpg.cpp 2013-12-11 20:12:14.000000000 +0100 @@ -39,7 +39,6 @@ KGpgApp::KGpgApp() : KUniqueApplication(), running(false), - args(0), w(NULL), s_keyManager(0) { @@ -94,7 +93,7 @@ } } - args = KCmdLineArgs::parsedArgs(); + KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); // parsing of command line args if (args->isSet("k") || (!KGpgSettings::showSystray() && (args->count() == 0) && !args->isSet("d"))) { @@ -105,8 +104,9 @@ } else if (args->isSet("d")) { s_keyManager->slotOpenEditor(); s_keyManager->hide(); - } else if (args->count() > 0) { - urlList.clear(); + } else { + KUrl::List urlList; + for (int ct = 0; ct < args->count(); ct++) urlList.append(args->url(ct)); @@ -118,22 +118,30 @@ } if (args->isSet("e")) { - if (!directoryInside) + if (urlList.isEmpty()) + KMessageBox::sorry(0, i18n("No files given.")); + else if (!directoryInside) KGpgExternalActions::encryptFiles(s_keyManager, urlList); else KGpgExternalActions::encryptFolders(s_keyManager, urlList); } else if (args->isSet("s")) { - if (!directoryInside) + if (urlList.isEmpty()) + KMessageBox::sorry(0, i18n("No files given.")); + else if (!directoryInside) w->showDroppedFile(urlList.first()); else KMessageBox::sorry(0, i18n("Cannot decrypt and show folder.")); } else if (args->isSet("S")) { - if (!directoryInside) + if (urlList.isEmpty()) + KMessageBox::sorry(0, i18n("No files given.")); + else if (!directoryInside) KGpgExternalActions::signFiles(s_keyManager, urlList); else KMessageBox::sorry(0, i18n("Cannot sign folder.")); } else if (args->isSet("V") != 0) { - if (!directoryInside) + if (urlList.isEmpty()) + KMessageBox::sorry(0, i18n("No files given.")); + else if (!directoryInside) w->verifyFile(urlList.first()); else KMessageBox::sorry(0, i18n("Cannot verify folder.")); @@ -143,7 +151,9 @@ return 0; } - if (urlList.first().fileName().endsWith(QLatin1String(".sig"))) { + if (urlList.isEmpty()) { + /* do nothing */ + } else if (urlList.first().fileName().endsWith(QLatin1String(".sig"))) { w->verifyFile(urlList.first()); } else { bool haskeys = false; @@ -170,10 +180,8 @@ } } } - } else if (args->allArguments().count() > 1) { - KMessageBox::sorry(0, i18n("No files given.")); - return 0; } + return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.11.97/kgpg.h new/kgpg-4.12.0/kgpg.h --- old/kgpg-4.11.97/kgpg.h 2013-11-27 03:00:02.000000000 +0100 +++ new/kgpg-4.12.0/kgpg.h 2013-12-11 20:12:14.000000000 +0100 @@ -49,12 +49,8 @@ int newInstance (); bool running; - KUrl::List urlList; KShortcut goHome; -protected: - KCmdLineArgs *args; - private: KGpgExternalActions *w; KeysManager *s_keyManager; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.11.97/main.cpp new/kgpg-4.12.0/main.cpp --- old/kgpg-4.11.97/main.cpp 2013-11-27 03:00:02.000000000 +0100 +++ new/kgpg-4.12.0/main.cpp 2013-12-11 20:12:14.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.10.97"; +static const char version[] = "2.11.0"; int main(int argc, char *argv[]) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.11.97/model/kgpgitemmodel.h new/kgpg-4.12.0/model/kgpgitemmodel.h --- old/kgpg-4.11.97/model/kgpgitemmodel.h 2013-11-27 03:00:02.000000000 +0100 +++ new/kgpg-4.12.0/model/kgpgitemmodel.h 2013-12-11 20:12:14.000000000 +0100 @@ -72,6 +72,7 @@ KGpgRootNode *getRootNode() const; QString statusCountMessage() const; static QString statusCountMessageString(const unsigned int keys, const unsigned int groups); + bool isDefaultKey(const KGpgNode *node) const; public Q_SLOTS: KGpgGroupNode *addGroup(const QString &name, const KGpgKeyNode::List &keys); @@ -92,7 +93,6 @@ int rowForNode(KGpgNode *node) const; void refreshKeyIds(const QStringList &id); void refreshKeyIds(KGpgKeyNode::List &nodes); - bool isDefaultKey(const KGpgNode *node) const; void updateNodeTrustColor(KGpgExpandableNode *node, const KgpgCore::KgpgKeyTrust trust, const QColor &color); }; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
