From f59208ec62303106c3a824dd2de3e6ecf0bf99b3 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Sun, 13 Aug 2006 07:32:27 +0000 Subject: [PATCH] 2006-08-13 [paul] 2.4.0cvs43 * src/editldap.c fix overlapping widgets * src/prefs_account.c fix translation of protocol_names[] fix label disappearing off the edge of the visible area --- ChangeLog | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/editldap.c | 6 +++--- src/prefs_account.c | 4 ++-- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef6527aff..e17c726e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-08-13 [paul] 2.4.0cvs43 + + * src/editldap.c + fix overlapping widgets + * src/prefs_account.c + fix translation of protocol_names[] + fix label disappearing off the edge of the + visible area + 2006-08-12 [paul] 2.4.0cvs42 * manual/plugins.xml diff --git a/PATCHSETS b/PATCHSETS index e5e7e4218..22cfe6a68 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1734,3 +1734,4 @@ ( cvs diff -u -r 1.115.2.101 -r 1.115.2.102 src/main.c; ) > 2.4.0cvs40.patchset ( cvs diff -u -r 1.382.2.299 -r 1.382.2.300 src/compose.c; cvs diff -u -r 1.274.2.136 -r 1.274.2.137 src/mainwindow.c; cvs diff -u -r 1.39.2.19 -r 1.39.2.20 src/mainwindow.h; cvs diff -u -r 1.150.2.70 -r 1.150.2.71 src/procmsg.c; cvs diff -u -r 1.60.2.30 -r 1.60.2.31 src/procmsg.h; cvs diff -u -r 1.395.2.228 -r 1.395.2.229 src/summaryview.c; cvs diff -u -r 1.43.2.48 -r 1.43.2.49 src/toolbar.c; ) > 2.4.0cvs41.patchset ( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 manual/plugins.xml; ) > 2.4.0cvs42.patchset +( cvs diff -u -r 1.8.2.13 -r 1.8.2.14 src/editldap.c; cvs diff -u -r 1.105.2.63 -r 1.105.2.64 src/prefs_account.c; ) > 2.4.0cvs43.patchset diff --git a/configure.ac b/configure.ac index cd7654df5..ddc227328 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=42 +EXTRA_VERSION=43 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/editldap.c b/src/editldap.c index ef858dcd7..3a424f3ce 100644 --- a/src/editldap.c +++ b/src/editldap.c @@ -462,7 +462,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) { hbox_spin = gtk_hbox_new (FALSE, 8); spinbtn_port_adj = gtk_adjustment_new (389, 1, 65535, 1, 1000, 1000); spinbtn_port = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_port_adj), 1, 0); - gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_port, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_port, TRUE, FALSE, 0); gtk_widget_set_size_request (spinbtn_port, 64, -1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_port), TRUE); @@ -482,8 +482,8 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) { "configuration in ldap.conf (TLS_CACERT or TLS_CACERTDIR fields)." ), NULL ); - gtk_box_pack_start (GTK_BOX (hbox_spin), enable_tls_chkbtn, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox_spin), enable_ssl_chkbtn, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox_spin), enable_tls_chkbtn, TRUE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox_spin), enable_ssl_chkbtn, TRUE, FALSE, 0); #endif gtk_table_attach(GTK_TABLE(table), hbox_spin, 1, 2, top, (top + 1), diff --git a/src/prefs_account.c b/src/prefs_account.c index 856aef227..8514da57a 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -1104,7 +1104,7 @@ static void prefs_account_basic_create(void) default_chkbtn = gtk_check_button_new_with_label (_("Set as default")); gtk_widget_show (default_chkbtn); - gtk_box_pack_end (GTK_BOX (hbox), default_chkbtn, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (hbox), default_chkbtn, TRUE, FALSE, 0); PACK_FRAME (vbox1, frame1, _("Personal information")); @@ -1178,7 +1178,7 @@ static void prefs_account_basic_create(void) menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu))); for( i = 0; i < NUM_RECV_PROTOCOLS; i++ ) if( protocol_names[i] != NULL ) - COMBOBOX_ADD (menu, protocol_names[i], i); + COMBOBOX_ADD (menu, _(protocol_names[i]), i); g_signal_connect(G_OBJECT(optmenu), "changed", G_CALLBACK(prefs_account_protocol_changed), NULL); -- 2.25.1