From 7278ac2b56431724dd4d8afecd8bfb7fc0c72b6e Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 4 Dec 2003 22:40:41 +0000 Subject: Make sure folder_path is non-NULL ("Loading..." nodes will have a NULL 2003-12-04 Jeffrey Stedfast * em-folder-tree-model.c (em_folder_tree_model_remove_folders): Make sure folder_path is non-NULL ("Loading..." nodes will have a NULL path). Fixes bug #51731. svn path=/trunk/; revision=23638 --- mail/ChangeLog | 10 ++++++++-- mail/em-folder-tree-model.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index d2706af1fb..78490a4f8d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,9 +1,15 @@ 2003-12-04 Jeffrey Stedfast - Fixes bug #51618 + * em-folder-tree-model.c (em_folder_tree_model_remove_folders): + Make sure folder_path is non-NULL ("Loading..." nodes will have a + NULL path). Fixes bug #51731. + +2003-12-04 Jeffrey Stedfast * mail-ops.c (empty_trash_empty): Get the proper local folders - store uri (it's not file:/ anymore). + store uri (it's not file:/ anymore). Fixes bug #51618. + +2003-12-04 Jeffrey Stedfast Fixes bug #51605. diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index cb82f7df7e..ada449660e 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -1072,7 +1072,7 @@ em_folder_tree_model_remove_folders (EMFolderTreeModel *model, struct _EMFolderT COL_STRING_FOLDER_PATH, &folder_path, COL_BOOL_IS_STORE, &is_store, -1); - if ((row = g_hash_table_lookup (si->path_hash, folder_path))) { + if (folder_path && (row = g_hash_table_lookup (si->path_hash, folder_path))) { g_hash_table_remove (si->path_hash, folder_path); gtk_tree_row_reference_free (row); } -- cgit v1.2.3