diff options
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 3 | ||||
| -rw-r--r-- | mail/mail-config.c | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index f281e9ba0e..afd76eb2b1 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2001-08-18 Jeffrey Stedfast <fejj@ximian.com> + + * mail-config.c (config_read): Change the default values for + "always-sign" to false. + + * mail-callbacks.c (open_msg): if the folder is Outbox, let the + user edit the message(s) too I guess. + 2001-08-18 Ettore Perazzoli <ettore@ximian.com> * folder-browser-ui.c: Hook the new `delete-message.png' up. diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index fdb9f9783c..e037aae277 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -1997,8 +1997,9 @@ void open_msg (GtkWidget *widget, gpointer user_data) { FolderBrowser *fb = FOLDER_BROWSER (user_data); + extern CamelFolder *outbox_folder; - if (folder_browser_is_drafts (fb)) + if (folder_browser_is_drafts (fb) || fb->folder == outbox_folder) edit_msg_internal (fb); else view_msg (NULL, user_data); diff --git a/mail/mail-config.c b/mail/mail-config.c index 6a2e8e5e6a..74dbdaf27c 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -344,7 +344,7 @@ config_read (void) path = g_strdup_printf ("/Mail/Accounts/account_pgp_always_sign_%d", i); account->pgp_always_sign = bonobo_config_get_boolean_with_default ( - config->db, path, TRUE, NULL); + config->db, path, FALSE, NULL); g_free (path); path = g_strdup_printf ("/Mail/Accounts/account_pgp_encrypt_to_self_%d", i); @@ -363,7 +363,7 @@ config_read (void) path = g_strdup_printf ("/Mail/Accounts/account_smime_always_sign_%d", i); account->smime_always_sign = bonobo_config_get_boolean_with_default ( - config->db, path, TRUE, NULL); + config->db, path, FALSE, NULL); g_free (path); path = g_strdup_printf ("/Mail/Accounts/account_smime_encrypt_to_self_%d", i); |