changeset 29063:8dd8d542bc6b

merge of 'd9f0ebaae821730c1fb7373ace99e91e9d796562' and 'dfce70a37f48336ba138aa2095158c7a16fad292'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Tue, 16 Feb 2010 17:36:36 +0000
parents 28714ff543cd (current diff) 9c5158a62705 (diff)
children c39d899dd62d
files
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/certificate.c	Tue Feb 16 17:33:15 2010 +0000
+++ b/libpurple/certificate.c	Tue Feb 16 17:36:36 2010 +0000
@@ -874,7 +874,6 @@
 #else
 # ifdef SSL_CERTIFICATES_DIR
 		x509_ca_paths = g_list_append(NULL, g_strdup(SSL_CERTIFICATES_DIR));
-# else
 # endif
 		x509_ca_paths = g_list_append(x509_ca_paths,
 			g_build_filename(DATADIR, "purple", "ca-certs", NULL));