aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-09 18:10:29 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-09 18:10:29 +0800
commit2161a418c4fb9d8c8970e36480fcfb1c010ee9ba (patch)
treeae2173228162414cb005bc1c49403ef3dac7b3ae /libempathy-gtk
parentdaf27468745030f6e3255972e923507e37b5ed17 (diff)
downloadgsoc2013-empathy-2161a418c4fb9d8c8970e36480fcfb1c010ee9ba.tar
gsoc2013-empathy-2161a418c4fb9d8c8970e36480fcfb1c010ee9ba.tar.gz
gsoc2013-empathy-2161a418c4fb9d8c8970e36480fcfb1c010ee9ba.tar.bz2
gsoc2013-empathy-2161a418c4fb9d8c8970e36480fcfb1c010ee9ba.tar.lz
gsoc2013-empathy-2161a418c4fb9d8c8970e36480fcfb1c010ee9ba.tar.xz
gsoc2013-empathy-2161a418c4fb9d8c8970e36480fcfb1c010ee9ba.tar.zst
gsoc2013-empathy-2161a418c4fb9d8c8970e36480fcfb1c010ee9ba.zip
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.
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-tls-dialog.c21
1 files changed, 15 insertions, 6 deletions
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 ("<b>%s</b>", _("Certificate Details"));
expander = gtk_expander_new (text);