[Pkg-gnupg-commit] [gpgme] 19/132: qt: Update config sync doc / comment

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gpgme.

commit ececfd5de81f1851943be7b284b672d5b02aceb4
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Jan 2 14:03:08 2017 +0100

    qt: Update config sync doc / comment
    
    * lang/qt/src/cryptoconfig.h (CryptoConfig::sync): Document
    that runtime option is always set.
    * lang/qt/Src/qgpgmenewcryptoconfig.cpp
    (QGpgMENewCryptoConfigComponent::sync): Remove outdated comment
    and warn on error.
---
 lang/qt/src/cryptoconfig.h            |  5 ++---
 lang/qt/src/qgpgmenewcryptoconfig.cpp | 13 ++++---------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/lang/qt/src/cryptoconfig.h b/lang/qt/src/cryptoconfig.h
index c3f0c7e..452bfbb 100644
--- a/lang/qt/src/cryptoconfig.h
+++ b/lang/qt/src/cryptoconfig.h
@@ -379,9 +379,8 @@ public:
     /**
      * Write back changes
      *
-     * @param runtime If this option is set, the changes will take effect at run-time, as
-     * far as this is possible.  Otherwise, they will take effect at the next
-     * start of the respective backend programs.
+     * @param runtime this parameter is ignored. Changes will always
+     * be made with --runtime set.
      */
     virtual void sync(bool runtime) = 0;
 
diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp
index eb3af56..49b27ca 100644
--- a/lang/qt/src/qgpgmenewcryptoconfig.cpp
+++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp
@@ -216,17 +216,12 @@ QGpgMENewCryptoConfigGroup *QGpgMENewCryptoConfigComponent::group(const QString
 
 void QGpgMENewCryptoConfigComponent::sync(bool runtime)
 {
-    Q_UNUSED(runtime)
-    // ### how to pass --runtime to gpgconf? -> marcus: not yet supported (2010-11-20)
+    Q_UNUSED(runtime) // runtime is always set by engine_gpgconf
     if (const Error err = m_component.save()) {
-#if 0
-        TODO port
-        const QString wmsg = i18n("Error from gpgconf while saving configuration: %1", QString::fromLocal8Bit(err.asString()));
-        qCWarning(GPGPME_BACKEND_LOG) << ":" << wmsg;
-        KMessageBox::error(0, wmsg);
-#endif
+        qCWarning(GPGPME_BACKEND_LOG) << ":"
+            << "Error from gpgconf while saving configuration: %1"
+            << QString::fromLocal8Bit(err.asString());
     }
-    // ### unset dirty state again
 }
 
 ////

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git