diff options
| -rw-r--r-- | mail/ChangeLog | 11 | ||||
| -rw-r--r-- | mail/em-folder-tree-model.c | 5 | ||||
| -rw-r--r-- | mail/mail-ops.c | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 8de4e11651..a1309dbaec 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,16 @@ 2004-04-28 Jeffrey Stedfast <fejj@ximian.com> + * em-folder-tree-model.c (em_folder_tree_model_remove_store): + Duh. If the lookup of si fails, don't use si->display_name in the + warning message. Actually, don't bother with a warning message at + all, this is a perfectly valid situation. Fixes bug #57746. + + * mail-ops.c (mail_send_message): Don't set the Date header here + anymore. It has either already been set (when written to the + Outbox) or will automagially be set to the current time if a Date + hasn't already been set when the transport sends it. Fixes bug + #57599. + * em-composer-prefs.c (sig_add_script_response): Use g_shell_parse_argv() to get the actual script path and then check that we can exec argv[0] rather than treating the entire diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index b0e2244cca..7800da1eef 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -901,11 +901,8 @@ em_folder_tree_model_remove_store (EMFolderTreeModel *model, CamelStore *store) g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model)); g_return_if_fail (CAMEL_IS_STORE (store)); - if (!(si = g_hash_table_lookup (model->store_hash, store))) { - g_warning ("the store `%s' is not in the folder tree", si->display_name); - + if (!(si = g_hash_table_lookup (model->store_hash, store))) return; - } path = gtk_tree_row_reference_get_path (si->row); gtk_tree_model_get_iter ((GtkTreeModel *) model, &iter, path); diff --git a/mail/mail-ops.c b/mail/mail-ops.c index d38cf4ff66..008ff84767 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -438,8 +438,6 @@ mail_send_message (CamelMimeMessage *message, const char *destination, camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer", "Ximian Evolution " VERSION SUB_VERSION " " VERSION_COMMENT); - camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0); - xev = mail_tool_remove_xevolution_headers (message); if (xev->account) { |