From f3c6203a63c4b9ff073b06c92cbd7a4175703220 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 28 Apr 2004 18:53:15 +0000 Subject: Duh. If the lookup of si fails, don't use si->display_name in the warning 2004-04-28 Jeffrey Stedfast * 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. svn path=/trunk/; revision=25670 --- mail/em-folder-tree-model.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'mail/em-folder-tree-model.c') 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); -- cgit