From e6c6b9f410de5d6dab3a45aeb467ca52e8bf02b9 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Wed, 15 Feb 2006 13:45:28 +0000 Subject: [PATCH] 2006-02-15 [wwp] 2.0.0cvs51 * src/plugins/pgpcore/prefs_gpg.c * src/prefs_account.c fix some widget sensitivity, mostly around some labels in account prefs. --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/pgpcore/prefs_gpg.c | 16 +++++++++++----- src/prefs_account.c | 22 ++++++++++++++++------ 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b46d256e6..03c28a5dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-02-15 [wwp] 2.0.0cvs51 + + * src/plugins/pgpcore/prefs_gpg.c + * src/prefs_account.c + fix some widget sensitivity, mostly around some labels in + account prefs. + 2006-02-15 [paul] 2.0.0cvs50 * manual/advanced.xml diff --git a/PATCHSETS b/PATCHSETS index 3f0c1f98f..d85279a1e 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1234,3 +1234,4 @@ ( cvs diff -u -r 1.49.2.72 -r 1.49.2.73 src/procmime.c; cvs diff -u -r 1.96.2.95 -r 1.96.2.96 src/textview.c; cvs diff -u -r 1.36.2.55 -r 1.36.2.56 src/common/utils.c; ) > 2.0.0cvs48.patchset ( cvs diff -u -r 1.1.14.1 -r 1.1.14.2 src/pixmaps/address_book.xpm; cvs diff -u -r 1.1.14.1 -r 1.1.14.2 src/pixmaps/preferences.xpm; cvs diff -u -r 1.1.14.1 -r 1.1.14.2 src/pixmaps/properties.xpm; ) > 2.0.0cvs49.patchset ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 manual/advanced.xml; ) > 2.0.0cvs50.patchset +( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/prefs_gpg.c; cvs diff -u -r 1.105.2.49 -r 1.105.2.50 src/prefs_account.c; ) > 2.0.0cvs51.patchset diff --git a/configure.ac b/configure.ac index 6aa7edf83..159afa239 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=50 +EXTRA_VERSION=51 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c index 8db540553..23e200e1d 100644 --- a/src/plugins/pgpcore/prefs_gpg.c +++ b/src/plugins/pgpcore/prefs_gpg.c @@ -192,6 +192,7 @@ struct GPGAccountPage GtkWidget *key_by_from; GtkWidget *key_custom; GtkWidget *keyid; + GtkWidget *keyid_label; PrefsAccount *account; }; @@ -202,6 +203,7 @@ void key_custom_toggled(GtkToggleButton *togglebutton, gpointer user_data) gboolean active; active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->key_custom)); + gtk_widget_set_sensitive(GTK_WIDGET(page->keyid_label), active); gtk_widget_set_sensitive(GTK_WIDGET(page->keyid), active); if (!active) gtk_editable_delete_text(GTK_EDITABLE(page->keyid), 0, -1); @@ -223,7 +225,7 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page, GtkWidget *key_default; GtkWidget *key_by_from; GtkWidget *key_custom; - GtkWidget *label1; + GtkWidget *keyid_label; GtkWidget *keyid; vbox = gtk_vbox_new(FALSE, 0); @@ -265,12 +267,12 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - label1 = gtk_label_new(_("User or key ID:")); - gtk_widget_show(label1); - gtk_table_attach(GTK_TABLE(table1), label1, 0, 2, 3, 4, + keyid_label = gtk_label_new(_("User or key ID:")); + gtk_widget_show(keyid_label); + gtk_table_attach(GTK_TABLE(table1), keyid_label, 0, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify(GTK_LABEL(label1), GTK_JUSTIFY_LEFT); + gtk_label_set_justify(GTK_LABEL(keyid_label), GTK_JUSTIFY_LEFT); keyid = gtk_entry_new(); gtk_widget_show(keyid); @@ -282,14 +284,17 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page, switch (config->sign_key) { case SIGN_KEY_DEFAULT: gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(key_default), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(keyid_label), FALSE); gtk_widget_set_sensitive(GTK_WIDGET(keyid), FALSE); break; case SIGN_KEY_BY_FROM: gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(key_by_from), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(keyid_label), FALSE); gtk_widget_set_sensitive(GTK_WIDGET(keyid), FALSE); break; case SIGN_KEY_CUSTOM: gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(key_custom), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(keyid_label), TRUE); gtk_widget_set_sensitive(GTK_WIDGET(keyid), TRUE); break; } @@ -303,6 +308,7 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page, page->key_by_from = key_by_from; page->key_custom = key_custom; page->keyid = keyid; + page->keyid_label = keyid_label; page->page.widget = vbox; page->account = account; diff --git a/src/prefs_account.c b/src/prefs_account.c index 6e08dc2d8..9ae3e293c 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -140,6 +140,8 @@ static struct Send { GtkWidget *smtp_pass_entry; GtkWidget *pop_bfr_smtp_chkbtn; GtkWidget *pop_bfr_smtp_tm_entry; + GtkWidget *pop_auth_timeout_lbl; + GtkWidget *pop_auth_minutes_lbl; } p_send; static struct Compose { @@ -1665,6 +1667,8 @@ static void prefs_account_send_create(void) GtkWidget *vbox_spc; GtkWidget *pop_bfr_smtp_chkbtn; GtkWidget *pop_bfr_smtp_tm_entry; + GtkWidget *pop_auth_timeout_lbl; + GtkWidget *pop_auth_minutes_lbl; vbox1 = gtk_vbox_new (FALSE, VSPACING); gtk_widget_show (vbox1); @@ -1808,18 +1812,18 @@ static void prefs_account_send_create(void) gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0); gtk_widget_set_size_request (hbox_spc, 12, -1); - label = gtk_label_new(_("POP authentication timeout: ")); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + pop_auth_timeout_lbl = gtk_label_new(_("POP authentication timeout: ")); + gtk_widget_show (pop_auth_timeout_lbl); + gtk_box_pack_start (GTK_BOX (hbox), pop_auth_timeout_lbl, FALSE, FALSE, 0); pop_bfr_smtp_tm_entry = gtk_entry_new (); gtk_widget_show (pop_bfr_smtp_tm_entry); gtk_widget_set_size_request (pop_bfr_smtp_tm_entry, 30, -1); gtk_box_pack_start (GTK_BOX (hbox), pop_bfr_smtp_tm_entry, FALSE, FALSE, 0); - label = gtk_label_new(_("minutes")); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + pop_auth_minutes_lbl = gtk_label_new(_("minutes")); + gtk_widget_show (pop_auth_minutes_lbl); + gtk_box_pack_start (GTK_BOX (hbox), pop_auth_minutes_lbl, FALSE, FALSE, 0); @@ -1833,6 +1837,8 @@ static void prefs_account_send_create(void) p_send.smtp_pass_entry = smtp_pass_entry; p_send.pop_bfr_smtp_chkbtn = pop_bfr_smtp_chkbtn; p_send.pop_bfr_smtp_tm_entry = pop_bfr_smtp_tm_entry; + p_send.pop_auth_timeout_lbl = pop_auth_timeout_lbl; + p_send.pop_auth_minutes_lbl = pop_auth_minutes_lbl; } static void prefs_account_compose_create(void) @@ -2549,6 +2555,10 @@ static void pop_bfr_smtp_tm_set_sens(GtkWidget *widget, gpointer data) { gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(p_send.pop_bfr_smtp_chkbtn))); + gtk_widget_set_sensitive(p_send.pop_auth_timeout_lbl, + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(p_send.pop_bfr_smtp_chkbtn))); + gtk_widget_set_sensitive(p_send.pop_auth_minutes_lbl, + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(p_send.pop_bfr_smtp_chkbtn))); } static void prefs_account_select_folder_cb(GtkWidget *widget, gpointer data) -- 2.25.1