# HG changeset patch # User William Ehlhardt # Date 1180572009 0 # Node ID fa33879e3a0a5e02a8777031ecb3ed8aa03262d0 # Parent 69e0551deebe655497d40d81509251c4a046d8ec# Parent 52ba21acc1689c1ef136128f2273856d76311ae2 merge of '4b282994660451b15a8a393ef032d32e9bf00d2e' and 'cca063073007b0d29e6e6aaf1b9df55926035009' diff -r 69e0551deebe -r fa33879e3a0a libpurple/plugins/ssl/ssl-gnutls.c --- a/libpurple/plugins/ssl/ssl-gnutls.c Wed May 30 23:39:44 2007 +0000 +++ b/libpurple/plugins/ssl/ssl-gnutls.c Thu May 31 00:40:09 2007 +0000 @@ -194,7 +194,7 @@ secondary = g_strdup_printf ( - _("Certificate name:\n%s\n\nKey fingerprint (SHA1): %s\n\nSerial Number: %s\n\nTODO: Expiration dates, etc.\n"), + _("Certificate name: %s\nKey fingerprint (SHA1):%s\nSerial Number:%s\nTODO: Expiration dates, etc.\n"), dn, fpr_asc, ser_asc ); @@ -267,8 +267,7 @@ gnutls_certificate_get_peers(session, &cert_list_size); purple_debug_info("gnutls", - "Peer %s provided %d certs\n", - gsc->host, + "Peer provided %d certs\n", cert_list_size); for (i=0; i