Mercurial > pidgin.yaz
comparison libpurple/certificate.c @ 29457:8dd8d542bc6b
merge of 'd9f0ebaae821730c1fb7373ace99e91e9d796562'
and 'dfce70a37f48336ba138aa2095158c7a16fad292'
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Tue, 16 Feb 2010 17:36:36 +0000 |
parents | 9c5158a62705 |
children | f44718de8b06 c35fd54ec64b |
comparison
equal
deleted
inserted
replaced
29455:28714ff543cd | 29457:8dd8d542bc6b |
---|---|
872 x509_ca_paths = g_list_append(NULL, g_build_filename(DATADIR, | 872 x509_ca_paths = g_list_append(NULL, g_build_filename(DATADIR, |
873 "ca-certs", NULL)); | 873 "ca-certs", NULL)); |
874 #else | 874 #else |
875 # ifdef SSL_CERTIFICATES_DIR | 875 # ifdef SSL_CERTIFICATES_DIR |
876 x509_ca_paths = g_list_append(NULL, g_strdup(SSL_CERTIFICATES_DIR)); | 876 x509_ca_paths = g_list_append(NULL, g_strdup(SSL_CERTIFICATES_DIR)); |
877 # else | |
878 # endif | 877 # endif |
879 x509_ca_paths = g_list_append(x509_ca_paths, | 878 x509_ca_paths = g_list_append(x509_ca_paths, |
880 g_build_filename(DATADIR, "purple", "ca-certs", NULL)); | 879 g_build_filename(DATADIR, "purple", "ca-certs", NULL)); |
881 #endif | 880 #endif |
882 } | 881 } |