From d4656431e9de8e6e3ab526d71323f0d0543c587e Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 30 Oct 2000 03:24:15 +0000 Subject: Improved IMAP namespace handling: leave the namespace in the folder names rather than constantly prepending it and stripping it off. Also some subscription fixes. * camel-store.c (camel_folder_info_build): Fix for the case where @top isn't in @folders. * providers/imap/camel-imap-folder.c (camel_imap_folder_new): Add a "short_name" argument rather than figuring it out ourselves. (imap_get_full_name): Implementation of CamelFolder::get_full_name that strips off namespace so the user doesn't have to see it. (imap_append_message, imap_copy_message_to, imap_move_message_to): Use folder->full_name rather than calling camel_imap_store_get_folder_path. * providers/imap/camel-imap-utils.c (imap_parse_list_response): Update this: make @flags a bitmask and @sep a char rather than a string. Make all of the out arguments optional. Handle literals in the server response. * providers/imap/camel-imap-store.c (imap_connect): Do a better job of getting the correct dir_sep for the namespace we're using. Construct a base_url here that will be used by get_folder_info. (camel_imap_store_folder_path): Removed (imap_folder_exists): Add an argument to return the short name of the folder (parsed out of the LIST response). Update for imap_parse_list_response change. (get_folder): Update for the various other changes. (get_folder_info): Update for the various other changes. Be more consistent about the returned layout: put everything underneath the "namespace" directory, including INBOX, even if it doesn't belong there. Don't destroy the list of subscribed folders until we've actually gotten the new list. (folder_subscribed, subscribe_folder, unsubscribe_folder): Use folder_name directly rather than camel_imap_store_folder_Path. * providers/imap/camel-imap-command.c (camel_imap_command): Update for folder name changes. svn path=/trunk/; revision=6256 --- camel/camel-store.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'camel/camel-store.c') diff --git a/camel/camel-store.c b/camel/camel-store.c index ac6337acac..c9236676b2 100644 --- a/camel/camel-store.c +++ b/camel/camel-store.c @@ -525,10 +525,15 @@ camel_folder_info_build (GPtrArray *folders, CamelFolderInfo *top, /* Hash the folders. */ hash = g_hash_table_new (g_str_hash, g_str_equal); + pfi = top; for (i = 0; i < folders->len; i++) { fi = folders->pdata[i]; + if (fi == top) + pfi = NULL; g_hash_table_insert (hash, fi->full_name, fi); } + if (pfi) + g_hash_table_insert (hash, pfi->full_name, pfi); /* Now find parents. */ for (i = 0; i < folders->len; i++) { -- cgit