diff options
| -rw-r--r-- | mail/ChangeLog | 3 | ||||
| -rw-r--r-- | mail/em-folder-tree-model.c | 2 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 7dbcc81cba..c13399c9ce 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,8 @@ 2004-06-11 Not Zed <NotZed@Ximian.com> + * em-folder-tree-model.c (em_folder_tree_model_add_store): revert + previous change. Stupid emftm. + * em-utils.c (em_uri_from_camel): handle a null path or fragment. * em-folder-tree-model.c (em_folder_tree_model_add_store): set the diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index b3d64c2154..aa32044b6f 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -748,7 +748,7 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model, CamelStore *store, con gtk_tree_store_set ((GtkTreeStore *) model, &iter, COL_STRING_DISPLAY_NAME, display_name, COL_POINTER_CAMEL_STORE, store, - COL_STRING_FULL_NAME, "", + COL_STRING_FULL_NAME, NULL, COL_BOOL_LOAD_SUBDIRS, TRUE, COL_BOOL_IS_STORE, TRUE, COL_STRING_URI, uri, -1); diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 96d5677073..614012deb3 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1810,7 +1810,7 @@ emft_tree_row_activated (GtkTreeView *treeview, GtkTreePath *tree_path, GtkTreeV gtk_tree_model_get (model, &iter, COL_STRING_FULL_NAME, &path, COL_STRING_URI, &uri, COL_UINT_FLAGS, &flags, -1); - + g_free (priv->selected_uri); priv->selected_uri = g_strdup (uri); |