commit 4dc2be8343394568f5c8f188b4375b8134b5c4b0
parent 69b34f06ccd93cd205632d18884373946f5f32ef
Author: Colin Leroy <colin@colino.net>
Date: Thu, 15 May 2008 17:07:29 +0000
2008-05-15 [colin] 3.4.0cvs40
* src/imap.c
Fix certificate port on TLS
* src/gtk/sslcertwindow.c
Make labels selectable
Diffstat:
5 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-15 [colin] 3.4.0cvs40
+
+ * src/imap.c
+ Fix certificate port on TLS
+ * src/gtk/sslcertwindow.c
+ Make labels selectable
+
2008-05-15 [colin] 3.4.0cvs39
* src/imap.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3335,3 +3335,4 @@
( cvs diff -u -r 1.1.2.47 -r 1.1.2.48 manual/advanced.xml; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/prefs_send.c; ) > 3.4.0cvs37.patchset
( cvs diff -u -r 1.1.2.48 -r 1.1.2.49 manual/advanced.xml; ) > 3.4.0cvs38.patchset
( cvs diff -u -r 1.179.2.217 -r 1.179.2.218 src/imap.c; ) > 3.4.0cvs39.patchset
+( cvs diff -u -r 1.179.2.218 -r 1.179.2.219 src/imap.c; cvs diff -u -r 1.9.2.20 -r 1.9.2.21 src/gtk/sslcertwindow.c; ) > 3.4.0cvs40.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
@@ -233,6 +233,7 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
gtk_table_attach(owner_table, label, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
label = gtk_label_new(subject_commonname);
+ gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_table_attach(owner_table, label, 1, 2, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -240,6 +241,7 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
gtk_table_attach(owner_table, label, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
label = gtk_label_new(subject_organization);
+ gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_table_attach(owner_table, label, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -247,6 +249,7 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
gtk_table_attach(owner_table, label, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0);
label = gtk_label_new(subject_location);
+ gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_table_attach(owner_table, label, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -254,6 +257,7 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
gtk_table_attach(signer_table, label, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
label = gtk_label_new(issuer_commonname);
+ gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_table_attach(signer_table, label, 1, 2, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -261,6 +265,7 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
gtk_table_attach(signer_table, label, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
label = gtk_label_new(issuer_organization);
+ gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_table_attach(signer_table, label, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -268,6 +273,7 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
gtk_table_attach(signer_table, label, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0);
label = gtk_label_new(issuer_location);
+ gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_table_attach(signer_table, label, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -275,18 +281,21 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
gtk_table_attach(status_table, label, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
label = gtk_label_new(fingerprint);
+ gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_table_attach(status_table, label, 1, 2, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
label = gtk_label_new(_("Signature status: "));
gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
gtk_table_attach(status_table, label, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
label = gtk_label_new(sig_status);
+ gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_table_attach(status_table, label, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
label = gtk_label_new(_("Expires on: "));
gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
gtk_table_attach(status_table, label, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0);
label = gtk_label_new(exp_date);
+ gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_table_attach(status_table, label, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -376,6 +385,7 @@ static gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert)
buf = g_strdup_printf(_("Signature status: %s"), sig_status);
label = gtk_label_new(buf);
+ gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
g_free(buf);
@@ -420,6 +430,7 @@ static gboolean sslcertwindow_ask_expired_cert(SSLCertificate *cert)
buf = g_strdup_printf(_("Signature status: %s"), sig_status);
label = gtk_label_new(buf);
+ gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
g_free(buf);
@@ -478,6 +489,7 @@ static gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCert
buf = g_strdup_printf(_("Signature status: %s"), sig_status);
label = gtk_label_new(buf);
+ gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0);
g_free(buf);
diff --git a/src/imap.c b/src/imap.c
@@ -1106,6 +1106,7 @@ static IMAPSession *imap_session_new(Folder * folder,
session_init(SESSION(session));
SESSION(session)->type = SESSION_IMAP;
SESSION(session)->server = g_strdup(account->recv_server);
+ SESSION(session)->port = port;
SESSION(session)->sock = NULL;
SESSION(session)->destroy = imap_session_destroy;