Mercurial > pidgin
diff libpurple/certificate.c @ 21570:dccfd999ffe7
merge of '76c07fcb434a2a7aa289734bb221c171a376d73b'
and 'bad7c4c4e108d186fa8527e487d174e67ae7c0c1'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Sat, 17 Nov 2007 17:27:48 +0000 |
| parents | 7109257d4612 |
| children | a57adf1de9cb 10a2ac84349d |
line wrap: on
line diff
--- a/libpurple/certificate.c Sun Nov 11 16:45:19 2007 +0000 +++ b/libpurple/certificate.c Sat Nov 17 17:27:48 2007 +0000 @@ -563,7 +563,7 @@ secondary = g_strdup_printf(_("Common name: %s %s\nFingerprint (SHA1): %s"), cn, cn_match, sha_asc); /* Make a semi-pretty display */ - purple_request_accept_cancel_with_hint( + purple_request_accept_cancel( vrq->cb_data, /* TODO: Find what the handle ought to be */ _("Single-use Certificate Verification"), primary, @@ -572,7 +572,6 @@ NULL, /* No account */ NULL, /* No other user */ NULL, /* No associated conversation */ - PURPLE_REQUEST_UI_HINT_BLIST, vrq, x509_singleuse_verify_cb, x509_singleuse_verify_cb ); @@ -1186,7 +1185,7 @@ vrq->subject_name); /* Make a semi-pretty display */ - purple_request_action_with_hint( + purple_request_action( vrq->cb_data, /* TODO: Find what the handle ought to be */ _("SSL Certificate Verification"), primary, @@ -1195,7 +1194,6 @@ NULL, /* No account */ NULL, /* No other user */ NULL, /* No associated conversation */ - PURPLE_REQUEST_UI_HINT_BLIST, x509_tls_cached_ua_ctx_new(vrq, reason), 3, /* Number of actions */ _("Accept"), x509_tls_cached_user_auth_accept_cb, @@ -1359,6 +1357,7 @@ /* Okay, we're done here */ purple_certificate_verify_complete(vrq, PURPLE_CERTIFICATE_INVALID); + return; } /* if (signature chain not good) */ /* Next, attempt to verify the last certificate against a CA */