# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1221009070 0
# Node ID dc35e51398b5a8552ceea67be5fdc9c82488375e
# Parent  0ee06de4981268b69706dcc7c2062ca29555257e# Parent  4ada5e2189d65743d2483ea29711ab4d1acd0c30
propagate from branch 'im.pidgin.pidgin' (head 7bbe14843cc0f5cc89746d07c3331b91bfa5edf5)
            to branch 'im.pidgin.pidgin.yaz' (head 692a0e3ff258b1522f9451f60d6daedc40581553)

diff -r 0ee06de49812 -r dc35e51398b5 finch/gntpounce.c
--- a/finch/gntpounce.c	Mon Sep 08 04:49:36 2008 +0000
+++ b/finch/gntpounce.c	Wed Sep 10 01:11:10 2008 +0000
@@ -979,15 +979,10 @@
 						PURPLE_CALLBACK(signed_on_off_cb), NULL);
 }
 
-static void
-dummy_pounce_cb(PurplePounce *pounce, PurplePounceEvent events, void *data)
-{
-}
-
 /* XXX: There's no such thing in pidgin. Perhaps there should be? */
 void finch_pounces_uninit()
 {
-	purple_pounces_register_handler(FINCH_UI, dummy_pounce_cb, NULL, NULL);
+	purple_pounces_unregister_handler(FINCH_UI);
 
 	purple_signals_disconnect_by_handle(finch_pounces_get_handle());
 }
diff -r 0ee06de49812 -r dc35e51398b5 libpurple/plugins/ssl/ssl-nss.c
--- a/libpurple/plugins/ssl/ssl-nss.c	Mon Sep 08 04:49:36 2008 +0000
+++ b/libpurple/plugins/ssl/ssl-nss.c	Wed Sep 10 01:11:10 2008 +0000
@@ -285,7 +285,8 @@
 	}
 	
 	for (count = 0 ; count < CERT_MAX_CERT_CHAIN ; count++) {
-		purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName, curcert->issuerName);
+		purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName,
+						  curcert->issuerName  ? curcert->issuerName : "(null)");
 		newcrt = x509_import_from_nss(curcert);
 		peer_certs = g_list_append(peer_certs, newcrt);
 
@@ -676,7 +677,8 @@
 	subjectCert = X509_NSS_DATA(crt);
 	g_return_val_if_fail(subjectCert, FALSE);
 
-	if ( PORT_Strcmp(subjectCert->issuerName, issuerCert->subjectName) != 0 )
+	if (subjectCert->issuerName == NULL
+			|| PORT_Strcmp(subjectCert->issuerName, issuerCert->subjectName) != 0)
 		return FALSE;
 	st = CERT_VerifySignedData(&subjectCert->signatureWrap, issuerCert, PR_Now(), NULL);
 	return st == SECSuccess;