# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1266341796 0
# Node ID 8dd8d542bc6b3368f22682a19eab3b8698f16e39
# Parent  28714ff543cd8cd5d3fe2ca72b895b97845b9e68# Parent  9c5158a62705a8528d0ee94766ad34ca36cf3d28
merge of 'd9f0ebaae821730c1fb7373ace99e91e9d796562'
     and 'dfce70a37f48336ba138aa2095158c7a16fad292'

diff -r 28714ff543cd -r 8dd8d542bc6b libpurple/certificate.c
--- 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));