diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2003-12-05 06:40:41 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-12-05 06:40:41 +0800 |
| commit | 7278ac2b56431724dd4d8afecd8bfb7fc0c72b6e (patch) | |
| tree | ef4f7bb6d39af1826d284224a8dc9b90b0c11ef6 | |
| parent | 2e7b29545026cd961e14972493b620645deeb0b5 (diff) | |
| download | gsoc2013-evolution-7278ac2b56431724dd4d8afecd8bfb7fc0c72b6e.tar.gz gsoc2013-evolution-7278ac2b56431724dd4d8afecd8bfb7fc0c72b6e.tar.zst gsoc2013-evolution-7278ac2b56431724dd4d8afecd8bfb7fc0c72b6e.zip | |
Make sure folder_path is non-NULL ("Loading..." nodes will have a NULL
2003-12-04 Jeffrey Stedfast <fejj@ximian.com>
* 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
| -rw-r--r-- | mail/ChangeLog | 10 | ||||
| -rw-r--r-- | mail/em-folder-tree-model.c | 2 |
2 files changed, 9 insertions, 3 deletions
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 <fejj@ximian.com> - 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 <fejj@ximian.com> * 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 <fejj@ximian.com> 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); } |