[git] GPGME - branch, master, updated. gpgme-1.6.0-199-g49a6ee5

[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  49a6ee50587c9d4b6f07e60ce1a939c863e7f15c (commit)
       via  47bfbc9026b49b9918359af5fcc1621aab0d1065 (commit)
       via  72b83ffc4d7581f4efef3bd7c261d7d7424bcf0e (commit)
      from  329ab93f7ed862d7f4c0501fca5355936a74ac52 (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 49a6ee50587c9d4b6f07e60ce1a939c863e7f15c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jul 5 22:11:42 2016 +0200

    Qt: Fix test build with Qt < 5.4.0
    
    * lang/qt/tests/t-keylist.cpp,
    lang/qt/tests/t-keylocate.cpp,
    lang/qt/tests/t-ownertrust.cpp: Use old style SIGNAl syntax for
    QSignalSpy

diff --git a/lang/qt/tests/t-keylist.cpp b/lang/qt/tests/t-keylist.cpp
index 40cb13c..5d63fca 100644
--- a/lang/qt/tests/t-keylist.cpp
+++ b/lang/qt/tests/t-keylist.cpp
@@ -69,7 +69,7 @@ private Q_SLOTS:
             Q_EMIT asyncDone();
         });
         job->start(QStringList() << "alfa at example.net");
-        QSignalSpy spy (this, &KeyListTest::asyncDone);
+        QSignalSpy spy (this, SIGNAL(asyncDone()));
         Q_ASSERT(spy.wait());
     }
 
diff --git a/lang/qt/tests/t-keylocate.cpp b/lang/qt/tests/t-keylocate.cpp
index 12ab551..682f722 100644
--- a/lang/qt/tests/t-keylocate.cpp
+++ b/lang/qt/tests/t-keylocate.cpp
@@ -80,7 +80,7 @@ private Q_SLOTS:
             Q_EMIT asyncDone();
         });
         job->start(QStringList() << mTestpattern);
-        QSignalSpy spy (this, &KeyLocateTest::asyncDone);
+        QSignalSpy spy (this, SIGNAL(asyncDone()));
         Q_ASSERT(spy.wait());
         qputenv("GNUPGHOME", oldHome.toUtf8());
     }
@@ -111,7 +111,7 @@ private Q_SLOTS:
             Q_EMIT asyncDone();
         });
         job->start(QStringList() << mTestpattern);
-        QSignalSpy spy (this, &KeyLocateTest::asyncDone);
+        QSignalSpy spy (this, SIGNAL(asyncDone()));
         Q_ASSERT(spy.wait());
     }
 
diff --git a/lang/qt/tests/t-ownertrust.cpp b/lang/qt/tests/t-ownertrust.cpp
index eb6c3db..9a0c1cd 100644
--- a/lang/qt/tests/t-ownertrust.cpp
+++ b/lang/qt/tests/t-ownertrust.cpp
@@ -70,7 +70,7 @@ private Q_SLOTS:
             Q_EMIT asyncDone();
         });
         job2->start(key, Key::Ultimate);
-        QSignalSpy spy (this, &ChangeOwnerTrustTest::asyncDone);
+        QSignalSpy spy (this, SIGNAL(asyncDone()));
         Q_ASSERT(spy.wait());
 
         job = openpgp()->keyListJob(false, true, true);

commit 47bfbc9026b49b9918359af5fcc1621aab0d1065
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jul 5 22:10:18 2016 +0200

    Qt: More robust lookup of Cpp's context.h
    
    * lang/qt/src/threadedjobmixin.h: When building qgpgme look for
    context.h in the full cpp subdirectory.
    
    --
    Gpgme core also contains a context.h that can lead to confusion
    otherwise.

diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h
index 62d7f1c..b29b827 100644
--- a/lang/qt/src/threadedjobmixin.h
+++ b/lang/qt/src/threadedjobmixin.h
@@ -41,7 +41,7 @@
 #include <QIODevice>
 
 #ifdef BUILDING_QGPGME
-# include "context.h"
+# include "lang/cpp/src/context.h"
 # include "interfaces/progressprovider.h"
 #else
 # include <gpgme++/context.h>

commit 72b83ffc4d7581f4efef3bd7c261d7d7424bcf0e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Mar 1 13:11:13 2016 +0100

    w32: Fallback to 2.1 reg key for gpgconf search
    
    * src/w32-util.c (_gpgme_get_gpgconf_path): Fallback to 2.1 installer
     registry key.
    
    --
    Finding gpgconf is utterly important so we should be as compatible
    as possible.

diff --git a/src/w32-util.c b/src/w32-util.c
index a27955b..0086fe3 100644
--- a/src/w32-util.c
+++ b/src/w32-util.c
@@ -563,15 +563,26 @@ _gpgme_get_gpgconf_path (void)
       gpgconf = find_program_at_standard_place (name2);
     }
 
-  /* 3. Try to find gpgconf.exe using that ancient registry key.  This
-        should eventually be removed.  */
+  /* 3. Try to find gpgconf.exe using the Windows registry. */
   if (!gpgconf)
     {
       char *dir;
 
-      dir = read_w32_registry_string ("HKEY_LOCAL_MACHINE",
+      dir = read_w32_registry_string (NULL,
                                       "Software\\GNU\\GnuPG",
                                       "Install Directory");
+      if (!dir)
+        {
+          char *tmp = read_w32_registry_string (NULL,
+                                                "Software\\GnuPG",
+                                                "Install Directory");
+          if (tmp)
+            {
+              if (gpgrt_asprintf (&dir, "%s\\bin", tmp) == -1)
+                return NULL;
+              free (tmp);
+            }
+        }
       if (dir)
         {
           gpgconf = find_program_in_dir (dir, name);

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

Summary of changes:
 lang/qt/src/threadedjobmixin.h |  2 +-
 lang/qt/tests/t-keylist.cpp    |  2 +-
 lang/qt/tests/t-keylocate.cpp  |  4 ++--
 lang/qt/tests/t-ownertrust.cpp |  2 +-
 src/w32-util.c                 | 17 ++++++++++++++---
 5 files changed, 19 insertions(+), 8 deletions(-)


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