[git] GPGME - branch, master, updated. gpgme-1.7.0-32-g8033cff

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  8033cff441e9ea185531290273ec343f3402703c (commit)
       via  88c7e84ede4b6017cac3a396e8c87c2bd3a2bf58 (commit)
      from  24779c9e2301bd17fd328d65b0383e1cbc944119 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8033cff441e9ea185531290273ec343f3402703c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 5 17:38:49 2016 +0200

    cpp: Bump Revision
    
    * configure.ac (LIBGPGMEPP_LT_REVISION): Bump revision.
    
    --
    The Data::Encoding enum now supports more encodings so
    this should have been done then.

diff --git a/configure.ac b/configure.ac
index 8634d8b..bc4aad9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ LIBGPGME_LT_REVISION=0
 
 LIBGPGMEPP_LT_CURRENT=6
 LIBGPGMEPP_LT_AGE=0
-LIBGPGMEPP_LT_REVISION=1
+LIBGPGMEPP_LT_REVISION=2
 
 LIBQGPGME_LT_CURRENT=7
 LIBQGPGME_LT_AGE=0

commit 88c7e84ede4b6017cac3a396e8c87c2bd3a2bf58
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 5 17:27:36 2016 +0200

    qt: Fix spelling error in WKSPublishJob
    
    * src/qgpgmewkspublishjob.cpp,
    src/qgpgmewkspublishjob.h,
    src/wkspublishjob.h,
    tests/t-wkspublish.cpp: Fix spelling of received.
    * src/configure.ac (LIBQGPGME_LT_CURRENT): Bump
    accordingly.
    
    --
    While this is an API break I've decided to fix this now
    instead of deprecating / keeping it around forever in the API.
    
    The only known users of QGpgME are KDE Applications and
    there it is not yet used.

diff --git a/configure.ac b/configure.ac
index 114225a..8634d8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,9 +65,9 @@ LIBGPGMEPP_LT_CURRENT=6
 LIBGPGMEPP_LT_AGE=0
 LIBGPGMEPP_LT_REVISION=1
 
-LIBQGPGME_LT_CURRENT=6
+LIBQGPGME_LT_CURRENT=7
 LIBQGPGME_LT_AGE=0
-LIBQGPGME_LT_REVISION=1
+LIBQGPGME_LT_REVISION=0
 
 # If the API is changed in an incompatible way: increment the next counter.
 GPGME_CONFIG_API_VERSION=1
diff --git a/lang/qt/src/qgpgmewkspublishjob.cpp b/lang/qt/src/qgpgmewkspublishjob.cpp
index 96f5a1d..9773893 100644
--- a/lang/qt/src/qgpgmewkspublishjob.cpp
+++ b/lang/qt/src/qgpgmewkspublishjob.cpp
@@ -141,7 +141,7 @@ static QGpgMEWKSPublishJob::result_type create_worker(const char *fpr, const QSt
                             proc.readAllStandardOutput(), proc.readAllStandardError(), QString(), Error());
 }
 
-static QGpgMEWKSPublishJob::result_type recieve_worker(const QByteArray &response)
+static QGpgMEWKSPublishJob::result_type receive_worker(const QByteArray &response)
 {
     if (response.isEmpty()) {
         return std::make_tuple (Error(make_error(GPG_ERR_INV_ARG)),
@@ -185,9 +185,9 @@ void QGpgMEWKSPublishJob::startCreate(const char *fpr, const QString &mailbox) {
     run(std::bind(&create_worker, fpr, mailbox));
 }
 
-void QGpgMEWKSPublishJob::startRecieve(const QByteArray &response)
+void QGpgMEWKSPublishJob::startReceive(const QByteArray &response)
 {
-    run(std::bind(&recieve_worker, response));
+    run(std::bind(&receive_worker, response));
 }
 
 #include "qgpgmewkspublishjob.moc"
diff --git a/lang/qt/src/qgpgmewkspublishjob.h b/lang/qt/src/qgpgmewkspublishjob.h
index 1a31149..5fd3c03 100644
--- a/lang/qt/src/qgpgmewkspublishjob.h
+++ b/lang/qt/src/qgpgmewkspublishjob.h
@@ -62,7 +62,7 @@ public:
 
     void startCheck(const QString &mailbox) Q_DECL_OVERRIDE;
     void startCreate(const char *fpr, const QString &mailbox) Q_DECL_OVERRIDE;
-    void startRecieve(const QByteArray &response) Q_DECL_OVERRIDE;
+    void startReceive(const QByteArray &response) Q_DECL_OVERRIDE;
 };
 
 }
diff --git a/lang/qt/src/wkspublishjob.h b/lang/qt/src/wkspublishjob.h
index d7bcd5d..0cec630 100644
--- a/lang/qt/src/wkspublishjob.h
+++ b/lang/qt/src/wkspublishjob.h
@@ -82,7 +82,7 @@ public:
      *
      * @param response The response of the server.
      **/
-    virtual void startRecieve(const QByteArray &response) = 0;
+    virtual void startReceive(const QByteArray &response) = 0;
 
 Q_SIGNALS:
     /* Result of the operation returned Data and returned Error are
diff --git a/lang/qt/tests/t-wkspublish.cpp b/lang/qt/tests/t-wkspublish.cpp
index 130c53b..326ecaa 100644
--- a/lang/qt/tests/t-wkspublish.cpp
+++ b/lang/qt/tests/t-wkspublish.cpp
@@ -226,7 +226,7 @@ private:
         Q_ASSERT(spy.wait());
     }
 
-    void testWKSPublishRecieve() {
+    void testWKSPublishReceive() {
         if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < "2.0.16") {
             /* Not supported */
             return;
@@ -258,7 +258,7 @@ private:
             Q_ASSERT(outstr.contains(
                      QStringLiteral("From: " TEST_ADDRESS)));
         });
-        job->startRecieve(QByteArray(testResponse));
+        job->startReceive(QByteArray(testResponse));
         Q_ASSERT(spy.wait());
     }
 

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                        | 6 +++---
 lang/qt/src/qgpgmewkspublishjob.cpp | 6 +++---
 lang/qt/src/qgpgmewkspublishjob.h   | 2 +-
 lang/qt/src/wkspublishjob.h         | 2 +-
 lang/qt/tests/t-wkspublish.cpp      | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org