From aed6d65aa9672c5c649f5c1c24e5247c51a5338b Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Fri, 4 Jul 2008 08:16:50 +0000 Subject: [PATCH] 2008-07-04 [paul] 3.5.0cvs3 * src/prefs_account.c layout/engrish fixes to the 'Client certificates' frame --- ChangeLog | 6 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_account.c | 64 ++++++++++++++++++++++++++------------------- 4 files changed, 45 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5efa0364..802c33c18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-04 [paul] 3.5.0cvs3 + + * src/prefs_account.c + layout/engrish fixes to the 'Client + certificates' frame + 2008-07-03 [colin] 3.5.0cvs2 * src/imap.c diff --git a/PATCHSETS b/PATCHSETS index c2e85202d..e01b205eb 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3414,3 +3414,4 @@ ( cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/gtk/authors.h; ) > 3.4.0cvs116.patchset ( cvs diff -u -r 1.26.2.36 -r 1.26.2.37 src/foldersel.c; ) > 3.5.0cvs1.patchset ( cvs diff -u -r 1.179.2.225 -r 1.179.2.226 src/imap.c; cvs diff -u -r 1.101.2.50 -r 1.101.2.51 src/news.c; cvs diff -u -r 1.56.2.61 -r 1.56.2.62 src/pop.c; cvs diff -u -r 1.105.2.132 -r 1.105.2.133 src/prefs_account.c; cvs diff -u -r 1.49.2.36 -r 1.49.2.37 src/prefs_account.h; cvs diff -u -r 1.204.2.172 -r 1.204.2.173 src/prefs_common.c; cvs diff -u -r 1.17.2.47 -r 1.17.2.48 src/send_message.c; cvs diff -u -r 1.23.2.17 -r 1.23.2.18 src/common/session.c; cvs diff -u -r 1.8.2.11 -r 1.8.2.12 src/common/session.h; cvs diff -u -r 1.11.2.24 -r 1.11.2.25 src/common/smtp.c; cvs diff -u -r 1.6.2.13 -r 1.6.2.14 src/common/smtp.h; cvs diff -u -r 1.13.2.18 -r 1.13.2.19 src/common/socket.h; cvs diff -u -r 1.9.2.28 -r 1.9.2.29 src/common/ssl.c; cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/common/ssl.h; cvs diff -u -r 1.4.2.27 -r 1.4.2.28 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/common/ssl_certificate.h; cvs diff -u -r 1.1.4.101 -r 1.1.4.102 src/etpan/imap-thread.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/etpan/nntp-thread.c; cvs diff -u -r 1.2.2.29 -r 1.2.2.30 src/gtk/inputdialog.c; ) > 3.5.0cvs2.patchset +( cvs diff -u -r 1.105.2.133 -r 1.105.2.134 src/prefs_account.c; ) > 3.5.0cvs3.patchset diff --git a/configure.ac b/configure.ac index 9f82860ac..5d44f7965 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=5 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=2 +EXTRA_VERSION=3 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_account.c b/src/prefs_account.c index 81243db8e..c01012c8e 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -2300,7 +2300,6 @@ static void ssl_create_widget_func(PrefsPage * _page, GtkWidget *smtp_starttls_radiobtn; GtkWidget *cert_frame; - GtkWidget *vbox6; GtkWidget *cert_table; GtkWidget *entry_in_cert_pass; GtkWidget *entry_out_cert_pass; @@ -2369,47 +2368,58 @@ static void ssl_create_widget_func(PrefsPage * _page, _("Use STARTTLS command to start SSL session"), SSL_STARTTLS); - vbox6 = gtkut_get_options_frame(vbox1, &cert_frame, _("Client certificates")); + PACK_FRAME(vbox1, cert_frame, _("Client certificates")); + cert_table = gtk_table_new(4,3, FALSE); + gtk_container_add(GTK_CONTAINER(cert_frame), cert_table); + gtk_container_set_border_width(GTK_CONTAINER(cert_table), 8); + gtk_table_set_row_spacings(GTK_TABLE(cert_table), VSPACING_NARROW_2); + gtk_table_set_col_spacings(GTK_TABLE(cert_table), 8); - label = gtk_label_new("Reception certificate"); + label = gtk_label_new(_("Certificate for receiving")); gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); entry_in_cert_file = gtk_entry_new(); in_ssl_cert_browse_button = gtkut_get_browse_file_btn(_("Browse")); - gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), label, _("Client certificate file as a PKCS12 or PEM file."), NULL); - gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), entry_in_cert_file, _("Client certificate file as a PKCS12 or PEM file."), NULL); - gtk_table_attach (GTK_TABLE (cert_table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); - gtk_table_attach (GTK_TABLE (cert_table), entry_in_cert_file, 1, 2, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); - gtk_table_attach (GTK_TABLE (cert_table), in_ssl_cert_browse_button, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); - - label = gtk_label_new("Certificate password"); + gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), label, + _("Client certificate file as a PKCS12 or PEM file"), NULL); + gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), entry_in_cert_file, + _("Client certificate file as a PKCS12 or PEM file"), NULL); + gtk_table_attach(GTK_TABLE(cert_table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(cert_table), entry_in_cert_file, 1, 2, 0, 1, + GTK_EXPAND|GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(cert_table), in_ssl_cert_browse_button, 2, 3, 0, 1, + GTK_FILL, 0, 0, 0); + + label = gtk_label_new(_("Password")); gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); entry_in_cert_pass = gtk_entry_new(); gtk_entry_set_visibility(GTK_ENTRY(entry_in_cert_pass), FALSE); - gtk_table_attach (GTK_TABLE (cert_table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); - gtk_table_attach (GTK_TABLE (cert_table), entry_in_cert_pass, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(cert_table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(cert_table), entry_in_cert_pass, 1, 2, 1, 2, + GTK_FILL, 0, 0, 0); - label = gtk_label_new("Send certificate"); + label = gtk_label_new(_("Certificate for sending")); gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); entry_out_cert_file = gtk_entry_new(); out_ssl_cert_browse_button = gtkut_get_browse_file_btn(_("Browse")); - gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), label, _("Client certificate file as a PKCS12 or PEM file."), NULL); - gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), entry_out_cert_file, _("Client certificate file as a PKCS12 or PEM file."), NULL); - gtk_table_attach (GTK_TABLE (cert_table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_table_attach (GTK_TABLE (cert_table), entry_out_cert_file, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0); - gtk_table_attach (GTK_TABLE (cert_table), out_ssl_cert_browse_button, 2, 3, 2, 3, GTK_FILL, 0, 0, 0); - - label = gtk_label_new("Certificate password"); + gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), label, + _("Client certificate file as a PKCS12 or PEM file"), NULL); + gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), entry_out_cert_file, + _("Client certificate file as a PKCS12 or PEM file."), NULL); + gtk_table_attach(GTK_TABLE(cert_table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(cert_table), entry_out_cert_file, 1, 2, 2, 3, + GTK_EXPAND|GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(cert_table), out_ssl_cert_browse_button, 2, 3, 2, 3, + GTK_FILL, 0, 0, 0); + + label = gtk_label_new(_("Password")); gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); entry_out_cert_pass = gtk_entry_new(); gtk_entry_set_visibility(GTK_ENTRY(entry_out_cert_pass), FALSE); - gtk_table_attach (GTK_TABLE (cert_table), label, 0, 1, 3, 4, GTK_FILL, 0, 0, 0); - gtk_table_attach (GTK_TABLE (cert_table), entry_out_cert_pass, 1, 2, 3, 4, GTK_FILL, 0, 0, 0); - hbox = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox); - gtk_box_pack_start (GTK_BOX (vbox6), hbox, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), cert_table, TRUE, TRUE, 0); - gtk_widget_show_all(vbox6); + gtk_table_attach(GTK_TABLE(cert_table), label, 0, 1, 3, 4, GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(cert_table), entry_out_cert_pass, 1, 2, 3, 4, + GTK_FILL, 0, 0, 0); + gtk_widget_show_all(cert_table); g_signal_connect(G_OBJECT(in_ssl_cert_browse_button), "clicked", G_CALLBACK(prefs_account_in_cert_browse_cb), NULL); -- 2.25.1