2012-05-16 [paul] 3.8.0cvs41
authorPaul Mangan <paul@claws-mail.org>
Wed, 16 May 2012 05:43:14 +0000 (05:43 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 16 May 2012 05:43:14 +0000 (05:43 +0000)
* src/common/ssl_certificate.c
fix bug 2646, 'Compile fails with gnutls-3.0.18'
Patch by Christian Hesse

ChangeLog
PATCHSETS
configure.ac
src/common/ssl_certificate.c

index 346d9a8..20901bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-16 [paul]      3.8.0cvs41
+
+       * src/common/ssl_certificate.c
+               fix bug 2646, 'Compile fails with gnutls-3.0.18'
+               Patch by Christian Hesse
+
 2012-05-11 [colin]     3.8.0cvs40
 
        * src/mimeview.c
index efb7e98..e7031c4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.155.2.99 -r 1.155.2.100 src/Makefile.am;  ) > 3.8.0cvs38.patchset
 ( cvs diff -u -r 1.155.2.100 -r 1.155.2.101 src/Makefile.am;  ) > 3.8.0cvs39.patchset
 ( cvs diff -u -r 1.83.2.188 -r 1.83.2.189 src/mimeview.c;  cvs diff -u -r 1.36.2.195 -r 1.36.2.196 src/common/utils.c;  ) > 3.8.0cvs40.patchset
+( cvs diff -u -r 1.4.2.40 -r 1.4.2.41 src/common/ssl_certificate.c;  ) > 3.8.0cvs41.patchset
index 3bba8a7..1c7b7e9 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=40
+EXTRA_VERSION=41
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index f37e51f..4911acb 100644 (file)
@@ -686,7 +686,7 @@ parse_pkcs12 (gnutls_pkcs12_t p12,
              gnutls_x509_privkey * key,
              gnutls_x509_crt_t * cert)
 {
-  gnutls_pkcs12_bag bag = NULL;
+  gnutls_pkcs12_bag_t bag = NULL;
   int index = 0;
   int ret;