From 5799cfdceaf45654bba88a2f82b72b0095773ccc Mon Sep 17 00:00:00 2001 From: Not Zed Date: Thu, 3 Oct 2002 00:15:23 +0000 Subject: /home/notzed/gnome/head/evolution/camel 2002-10-02 Not Zed * providers/imap/camel-imap-folder.c (get_matching): Set *set to NULL if we dont get any matches. (imap_sync_online): If we get no matches, skip any work, also reorder some code to make it easier to skip. See #31031. * providers/imap/camel-imap-store.c (imap_check_folder_still_extant): Default to "TRUE", if the list command failed, it probably means a server problem, assume the worst. This makes imap_refresh_info not clear the exception and crash. Fixes crash of #31000. 2002-10-01 Not Zed * providers/imap/camel-imap-folder.c (imap_refresh_info): Make sure we pass the exception to imap_folder_selected(), otherwise failures can be lost. See bug #31000. 2002-10-01 Not Zed * camel-folder.c (thaw): Add an assertion that the frozen count>0. (freeze): Same for >= 0. * camel-vee-folder.c (camel_vee_folder_remove_folder): Use the unmatched freeze_count when thawing folders removed from unmatched, rather than the folder's freeze_count. Might be related to #27391. svn path=/trunk/; revision=18314 --- camel/providers/imap/camel-imap-store.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'camel/providers/imap/camel-imap-store.c') diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index fe0a04f8dc..1da03ffdef 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -944,24 +944,16 @@ imap_check_folder_still_extant (CamelImapStore *imap_store, const char *full_nam full_name); if (response) { - gboolean stillthere = FALSE; - - if (response->untagged->len) - stillthere = TRUE; + gboolean stillthere = response->untagged->len != 0; camel_imap_response_free_without_processing (imap_store, response); - if (stillthere) - return TRUE; + return stillthere; } - /* either LIST command was rejected or it gave no results, - * we can be sure that the folder is gone. */ - - camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID, - _("The folder %s no longer exists"), - full_name); - return FALSE; + /* if the command was rejected, there must be some other error, + assume it worked so we dont blow away the folder unecessarily */ + return TRUE; } static void @@ -1008,7 +1000,6 @@ imap_store_refresh_folders (CamelImapStore *store, CamelException *ex) camel_object_unref((CamelObject *)folder); imap_folder_effectively_unsubscribed (store, namedup, ex); imap_forget_folder (store, namedup, ex); - camel_exception_clear (ex); g_free (namedup); } else camel_object_unref((CamelObject *)folder); -- cgit v1.2.3