From c3eb5ce5e5c98bfbd6e190b2b1b7eac11d1d160d Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Tue, 8 Mar 2011 07:34:35 +0100 Subject: [PATCH] libempathy-gtk: In TLS Dialog allow remembering of any exception. Previously we couldn't do this because we had nowhere to store these exceptions. But now this is possible because we're storing them as trust assertions. https://bugzilla.gnome.org/show_bug.cgi?id=639417 --- libempathy-gtk/empathy-tls-dialog.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c index 8f1f49ed..991f5213 100644 --- a/libempathy-gtk/empathy-tls-dialog.c +++ b/libempathy-gtk/empathy-tls-dialog.c @@ -293,21 +293,12 @@ empathy_tls_dialog_constructed (GObject *object) content_area = gtk_dialog_get_content_area (dialog); - /* FIXME: right now we do this only if the error is SelfSigned, as we can - * easily store the new CA cert in $XDG_CONFIG_DIR/telepathy/certs in that - * case. For the other errors, we probably need a smarter/more powerful - * certificate storage. - */ - if (priv->reason == EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED) - { - checkbox = gtk_check_button_new_with_label ( - _("Remember this choice for future connections")); - gtk_box_pack_end (GTK_BOX (content_area), checkbox, FALSE, FALSE, 0); - gtk_widget_show (checkbox); - - g_signal_connect (checkbox, "toggled", - G_CALLBACK (checkbox_toggled_cb), self); - } + checkbox = gtk_check_button_new_with_label ( + _("Remember this choice for future connections")); + gtk_box_pack_end (GTK_BOX (content_area), checkbox, FALSE, FALSE, 0); + gtk_widget_show (checkbox); + g_signal_connect (checkbox, "toggled", G_CALLBACK (checkbox_toggled_cb), + self); text = g_strdup_printf ("%s", _("Certificate Details")); expander = gtk_expander_new (text); -- 2.39.2