diff options
| -rw-r--r-- | mail/em-folder-tree-model.c | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 623fd55edd..cd79927ff7 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -1268,14 +1268,46 @@ GtkTreeRowReference * em_folder_tree_model_lookup_uri (EMFolderTreeModel *model, const gchar *folder_uri) { - GtkTreeRowReference *reference; + GtkTreeRowReference *reference = NULL; + EMFolderTreeModelStoreInfo *si; + EMailSession *session; + CamelStore *store = NULL; + gchar *folder_name = NULL; + GError *error = NULL; g_return_val_if_fail (EM_IS_FOLDER_TREE_MODEL (model), NULL); g_return_val_if_fail (folder_uri != NULL, NULL); - reference = g_hash_table_lookup (model->priv->uri_index, folder_uri); + session = em_folder_tree_model_get_session (model); + g_return_val_if_fail (E_IS_MAIL_SESSION (session), NULL); + + e_mail_folder_uri_parse ( + CAMEL_SESSION (session), + folder_uri, &store, &folder_name, &error); + + if (error != NULL) { + g_warn_if_fail (store == NULL); + g_warn_if_fail (folder_name == NULL); + g_warning ("%s: %s", G_STRFUNC, error->message); + g_error_free (error); + return NULL; + } + + g_return_val_if_fail (CAMEL_IS_STORE (store), NULL); + g_return_val_if_fail (folder_name != NULL, NULL); + + si = g_hash_table_lookup (model->priv->store_index, store); + + if (si != NULL) + reference = g_hash_table_lookup (si->full_hash, folder_name); + + if (!gtk_tree_row_reference_valid (reference)) + reference = NULL; + + g_object_unref (store); + g_free (folder_name); - return gtk_tree_row_reference_valid (reference) ? reference : NULL; + return reference; } void |