From 433683fae007ac7effc4418991cbadaf022d205a Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 1 Apr 2004 19:47:06 +0000 Subject: Updated for signature API changes. 2004-04-01 Jeffrey Stedfast * importers/netscape-importer.c (netscape_import_accounts): Updated for signature API changes. * mail-account-gui.c: Same. * mail-signature-editor.c: Same. * em-composer-prefs.c: Same. * mail-config.c: Rewrote the signature stuff to use ESignatureList instead. Much cleaner and less broken. * em-mailer-prefs.c (em_mailer_prefs_construct): Always make the Add/Remove Header buttons de-sensitised at the start. Fixes bug #56284. svn path=/trunk/; revision=25282 --- mail/em-mailer-prefs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mail/em-mailer-prefs.c') diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index b2743c7740..19ade2393d 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -679,11 +679,13 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) /* headers */ locked = !gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/display/headers", NULL); + /* always de-sensitised until the user types something in the entry */ prefs->add_header = GTK_BUTTON (glade_xml_get_widget (gui, "cmdHeadersAdd")); - gtk_widget_set_sensitive ((GtkWidget *) prefs->add_header, !locked); + gtk_widget_set_sensitive ((GtkWidget *) prefs->add_header, FALSE); + /* always de-sensitised until the user selects a header in the list */ prefs->remove_header = GTK_BUTTON (glade_xml_get_widget (gui, "cmdHeadersRemove")); - gtk_widget_set_sensitive ((GtkWidget *) prefs->remove_header, !locked); + gtk_widget_set_sensitive ((GtkWidget *) prefs->remove_header, FALSE); prefs->entry_header = GTK_ENTRY (glade_xml_get_widget (gui, "txtHeaders")); gtk_widget_set_sensitive ((GtkWidget *) prefs->entry_header, !locked); @@ -783,7 +785,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) } g_slist_free (header_add_list); - emmp_header_remove_sensitivity (prefs); /* Junk prefs */ prefs->check_incoming = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkCheckIncomingMail")); -- cgit v1.2.3