From 2161a418c4fb9d8c8970e36480fcfb1c010ee9ba Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 9 Mar 2011 11:10:29 +0100 Subject: Revert "libempathy-gtk: In TLS Dialog allow remembering of any exception." This reverts commit d6dccee01a1554244d31d7bdc79f23212a7a3f4f. The certificate management refactoring have not been backported to 2.34 so we can't backport this fix either. --- libempathy-gtk/empathy-tls-dialog.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c index 785338525..4fa950f31 100644 --- a/libempathy-gtk/empathy-tls-dialog.c +++ b/libempathy-gtk/empathy-tls-dialog.c @@ -285,12 +285,21 @@ empathy_tls_dialog_constructed (GObject *object) content_area = gtk_dialog_get_content_area (dialog); - 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); + /* 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); + } text = g_strdup_printf ("%s", _("Certificate Details")); expander = gtk_expander_new (text); -- cgit v1.2.3