diff options
| -rw-r--r-- | mail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail/mail-composer-prefs.c | 2 | ||||
| -rw-r--r-- | mail/mail-config.c | 6 |
3 files changed, 11 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 03cb3d2e0a..9e28c45e47 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -7,6 +7,10 @@ 2002-06-07 Radek Doulik <rodo@ximian.com> + * mail-config.c (mail_config_write_account_sig): call + mail_config_init to be sure we have the db, save auto_signature as + well + * mail-composer-prefs.c (sig_add_script_cancel): hook this to cancel button in signature script dialog diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c index 3c835f7446..4a6549768e 100644 --- a/mail/mail-composer-prefs.c +++ b/mail/mail-composer-prefs.c @@ -305,7 +305,7 @@ sig_add_script_add (GtkWidget *widget, MailComposerPrefs *prefs) static void sig_add_script_cancel (GtkWidget *widget, MailComposerPrefs *prefs) { - gnome_dialog_close (prefs->sig_script_dialog); + gnome_dialog_close (GNOME_DIALOG (prefs->sig_script_dialog)); } static void diff --git a/mail/mail-config.c b/mail/mail-config.c index 0a6bf6ed95..033f9d646f 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -982,6 +982,8 @@ mail_config_write_account_sig (MailConfigAccount *account, gint i) { char *path; + mail_config_init (); + if (i == -1) { GSList *link; @@ -998,6 +1000,10 @@ mail_config_write_account_sig (MailConfigAccount *account, gint i) bonobo_config_set_long (config->db, path, account->id->def_signature ? account->id->def_signature->id : -1, NULL); g_free (path); + + path = g_strdup_printf ("/Mail/Accounts/identity_autogenerated_signature_%d", i); + bonobo_config_set_boolean (config->db, path, account->id->auto_signature, NULL); + g_free (path); } void |