Mercurial > pidgin
comparison libpurple/certificate.c @ 21069:fdefa5eb46e2
propagate from branch 'im.pidgin.pidgin' (head 1757e82b3ed17d8ad45db9d2c62f0187a8bee93d)
to branch 'org.maemo.garage.pidgin.pidgin.dialog-transience' (head a7af6ce1e8f29eb0eb1bffc0ebb72813c4c5fdbf)
author | Gabriel Schulhof <nix@go-nix.ca> |
---|---|
date | Sat, 06 Oct 2007 15:55:47 +0000 |
parents | 17e605dd2de1 285bb637a2b7 |
children | 8c9aad9479c0 |
comparison
equal
deleted
inserted
replaced
20794:366204358e93 | 21069:fdefa5eb46e2 |
---|---|
561 /* Make messages */ | 561 /* Make messages */ |
562 primary = g_strdup_printf(_("%s has presented the following certificate for just-this-once use:"), vrq->subject_name); | 562 primary = g_strdup_printf(_("%s has presented the following certificate for just-this-once use:"), vrq->subject_name); |
563 secondary = g_strdup_printf(_("Common name: %s %s\nFingerprint (SHA1): %s"), cn, cn_match, sha_asc); | 563 secondary = g_strdup_printf(_("Common name: %s %s\nFingerprint (SHA1): %s"), cn, cn_match, sha_asc); |
564 | 564 |
565 /* Make a semi-pretty display */ | 565 /* Make a semi-pretty display */ |
566 purple_request_accept_cancel( | 566 purple_request_accept_cancel_with_hint( |
567 vrq->cb_data, /* TODO: Find what the handle ought to be */ | 567 vrq->cb_data, /* TODO: Find what the handle ought to be */ |
568 _("Single-use Certificate Verification"), | 568 _("Single-use Certificate Verification"), |
569 primary, | 569 primary, |
570 secondary, | 570 secondary, |
571 1, /* Accept by default */ | 571 1, /* Accept by default */ |
572 NULL, /* No account */ | 572 NULL, /* No account */ |
573 NULL, /* No other user */ | 573 NULL, /* No other user */ |
574 NULL, /* No associated conversation */ | 574 NULL, /* No associated conversation */ |
575 "blist", | |
575 vrq, | 576 vrq, |
576 x509_singleuse_verify_cb, | 577 x509_singleuse_verify_cb, |
577 x509_singleuse_verify_cb ); | 578 x509_singleuse_verify_cb ); |
578 | 579 |
579 /* Cleanup */ | 580 /* Cleanup */ |
1183 /* Make messages */ | 1184 /* Make messages */ |
1184 primary = g_strdup_printf(_("Accept certificate for %s?"), | 1185 primary = g_strdup_printf(_("Accept certificate for %s?"), |
1185 vrq->subject_name); | 1186 vrq->subject_name); |
1186 | 1187 |
1187 /* Make a semi-pretty display */ | 1188 /* Make a semi-pretty display */ |
1188 purple_request_action( | 1189 purple_request_action_with_hint( |
1189 vrq->cb_data, /* TODO: Find what the handle ought to be */ | 1190 vrq->cb_data, /* TODO: Find what the handle ought to be */ |
1190 _("SSL Certificate Verification"), | 1191 _("SSL Certificate Verification"), |
1191 primary, | 1192 primary, |
1192 reason, | 1193 reason, |
1193 2, /* Accept by default */ | 1194 2, /* Accept by default */ |
1194 NULL, /* No account */ | 1195 NULL, /* No account */ |
1195 NULL, /* No other user */ | 1196 NULL, /* No other user */ |
1196 NULL, /* No associated conversation */ | 1197 NULL, /* No associated conversation */ |
1198 "blist", | |
1197 x509_tls_cached_ua_ctx_new(vrq, reason), | 1199 x509_tls_cached_ua_ctx_new(vrq, reason), |
1198 3, /* Number of actions */ | 1200 3, /* Number of actions */ |
1199 _("Accept"), x509_tls_cached_user_auth_accept_cb, | 1201 _("Accept"), x509_tls_cached_user_auth_accept_cb, |
1200 _("Reject"), x509_tls_cached_user_auth_reject_cb, | 1202 _("Reject"), x509_tls_cached_user_auth_reject_cb, |
1201 _("_View Certificate..."), x509_tls_cached_show_cert); | 1203 _("_View Certificate..."), x509_tls_cached_show_cert); |