diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-03-09 16:10:23 +0800 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-03-09 16:10:23 +0800 |
| commit | e469159d894fd16ff425dca1a3e0a65ab69e2deb (patch) | |
| tree | 9321e77800d1daad134fc68352c3452fb062d32d /libempathy-gtk | |
| parent | ee32bebf86571c0eb386820f741b98d0f8504be6 (diff) | |
| parent | c3eb5ce5e5c98bfbd6e190b2b1b7eac11d1d160d (diff) | |
| download | gsoc2013-empathy-e469159d894fd16ff425dca1a3e0a65ab69e2deb.tar gsoc2013-empathy-e469159d894fd16ff425dca1a3e0a65ab69e2deb.tar.gz gsoc2013-empathy-e469159d894fd16ff425dca1a3e0a65ab69e2deb.tar.bz2 gsoc2013-empathy-e469159d894fd16ff425dca1a3e0a65ab69e2deb.tar.lz gsoc2013-empathy-e469159d894fd16ff425dca1a3e0a65ab69e2deb.tar.xz gsoc2013-empathy-e469159d894fd16ff425dca1a3e0a65ab69e2deb.tar.zst gsoc2013-empathy-e469159d894fd16ff425dca1a3e0a65ab69e2deb.zip | |
Merge branch 'remember-any-exception'
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-tls-dialog.c | 21 |
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); |