[Commits] imap-thread.c 1.1.4.125 1.1.4.126 nntp-thread.c 1.1.2.22 1.1.2.23

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/etpan
In directory srv:/tmp/cvs-serv1449/src/etpan

Modified Files:
      Tag: gtk2
	imap-thread.c nntp-thread.c 
Log Message:
2012-11-23 [colin]	3.9.0cvs20

	* src/jpilot.c
	* src/main.c
	* src/mainwindow.c
	* src/matcher.c
	* src/prefs_common.c
	* src/prefs_common.h
	* src/procmsg.c
	* src/common/socket.c
	* src/common/socket.h
	* src/common/ssl.c
	* src/common/ssl_certificate.c
	* src/common/ssl_certificate.h
	* src/etpan/imap-thread.c
	* src/etpan/nntp-thread.c
		Cleanup some warnings and deprecated types. Patch by
		Christian Hesse, fixing bug #2617. Thanks!

Index: nntp-thread.c
===================================================================
RCS file: /home/claws-mail/claws/src/etpan/Attic/nntp-thread.c,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -d -r1.1.2.22 -r1.1.2.23
--- nntp-thread.c	16 Sep 2012 21:56:21 -0000	1.1.2.22
+++ nntp-thread.c	23 Nov 2012 19:29:16 -0000	1.1.2.23
@@ -374,8 +374,8 @@
 {
 #ifdef USE_GNUTLS
 	struct connect_param *param = (struct connect_param *)data;
-	gnutls_x509_crt cert = NULL;
-	gnutls_datum tmp;
+	gnutls_x509_crt_t cert = NULL;
+	gnutls_datum_t tmp;
 	
 	if (certificate == NULL || len < 0) {
 		g_warning("no cert presented.\n");
@@ -407,8 +407,8 @@
 	PrefsAccount *account = (PrefsAccount *)data;
 	const gchar *cert_path = NULL;
 	const gchar *password = NULL;
-	gnutls_x509_crt x509 = NULL;
-	gnutls_x509_privkey pkey = NULL;
+	gnutls_x509_crt_t x509 = NULL;
+	gnutls_x509_privkey_t pkey = NULL;
 
 	if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file)
 		cert_path = account->in_ssl_client_cert_file;

Index: imap-thread.c
===================================================================
RCS file: /home/claws-mail/claws/src/etpan/Attic/imap-thread.c,v
retrieving revision 1.1.4.125
retrieving revision 1.1.4.126
diff -u -d -r1.1.4.125 -r1.1.4.126
--- imap-thread.c	21 Nov 2012 09:49:02 -0000	1.1.4.125
+++ imap-thread.c	23 Nov 2012 19:29:16 -0000	1.1.4.126
@@ -523,8 +523,8 @@
 {
 #ifdef USE_GNUTLS
 	struct connect_param *param = (struct connect_param *)data;
-	gnutls_x509_crt cert = NULL;
-	gnutls_datum tmp;
+	gnutls_x509_crt_t cert = NULL;
+	gnutls_datum_t tmp;
 	
 	if (certificate == NULL || len < 0) {
 		g_warning("no cert presented.\n");
@@ -556,8 +556,8 @@
 	PrefsAccount *account = (PrefsAccount *)data;
 	const gchar *cert_path = NULL;
 	const gchar *password = NULL;
-	gnutls_x509_crt x509 = NULL;
-	gnutls_x509_privkey pkey = NULL;
+	gnutls_x509_crt_t x509 = NULL;
+	gnutls_x509_privkey_t pkey = NULL;
 
 	if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file)
 		cert_path = account->in_ssl_client_cert_file;