aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-tls-dialog.c
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-03-08 14:34:35 +0800
committerStef Walter <stefw@collabora.co.uk>2011-03-08 14:35:56 +0800
commitc3eb5ce5e5c98bfbd6e190b2b1b7eac11d1d160d (patch)
tree9af62cd29552c9b3f71721173f6fd33f6ce69d31 /libempathy-gtk/empathy-tls-dialog.c
parentc4f12fc9ad76f90374e08460971f001fdfb90036 (diff)
downloadgsoc2013-empathy-c3eb5ce5e5c98bfbd6e190b2b1b7eac11d1d160d.tar
gsoc2013-empathy-c3eb5ce5e5c98bfbd6e190b2b1b7eac11d1d160d.tar.gz
gsoc2013-empathy-c3eb5ce5e5c98bfbd6e190b2b1b7eac11d1d160d.tar.bz2
gsoc2013-empathy-c3eb5ce5e5c98bfbd6e190b2b1b7eac11d1d160d.tar.lz
gsoc2013-empathy-c3eb5ce5e5c98bfbd6e190b2b1b7eac11d1d160d.tar.xz
gsoc2013-empathy-c3eb5ce5e5c98bfbd6e190b2b1b7eac11d1d160d.tar.zst
gsoc2013-empathy-c3eb5ce5e5c98bfbd6e190b2b1b7eac11d1d160d.zip
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
Diffstat (limited to 'libempathy-gtk/empathy-tls-dialog.c')
-rw-r--r--libempathy-gtk/empathy-tls-dialog.c21
1 files changed, 6 insertions, 15 deletions
diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index 8f1f49ed6..991f52133 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 ("<b>%s</b>", _("Certificate Details"));
expander = gtk_expander_new (text);