From bec22b99bb0c5afa61934c09b2bd633775a19c7e Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 21 May 2002 20:54:18 +0000 Subject: Don't call some retarded function to simply set an exception. 2002-05-16 Jeffrey Stedfast * providers/imap/camel-imap-store.c (get_folder_offline): Don't call some retarded function to simply set an exception. svn path=/trunk/; revision=16970 --- camel/ChangeLog | 3 +++ camel/providers/imap/camel-imap-folder.h | 2 +- camel/providers/imap/camel-imap-store.c | 8 ++++++-- camel/providers/imap/camel-imap-store.h | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) (limited to 'camel') diff --git a/camel/ChangeLog b/camel/ChangeLog index 7caa2a9cee..54c2aa3a77 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -5,6 +5,9 @@ 2002-05-16 Jeffrey Stedfast + * providers/imap/camel-imap-store.c (get_folder_offline): Don't + call some retarded function to simply set an exception. + * camel-filter-search.c (get_label): New e-sexp callback function to get a user_tag label value. diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h index 8ab7d009da..a49f7bd497 100644 --- a/camel/providers/imap/camel-imap-folder.h +++ b/camel/providers/imap/camel-imap-folder.h @@ -31,7 +31,7 @@ #ifdef __cplusplus extern "C" { #pragma } -#endif /* __cplusplus }*/ +#endif /* __cplusplus */ #include "camel-imap-types.h" #include diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index 4d983bebf0..99c77c6f27 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -1140,8 +1140,12 @@ get_folder_offline (CamelStore *store, const char *folder_name, folder_name = "INBOX"; folder_dir = e_path_to_physical (imap_store->storage_path, folder_name); - if (access (folder_dir, F_OK) != 0) - return no_such_folder (folder_name, ex); + if (!folder_dir || access (folder_dir, F_OK) != 0) { + g_free (folder_dir); + camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER, + _("No such folder %s"), folder_name); + return NULL; + } new_folder = camel_imap_folder_new (store, folder_name, folder_dir, ex); g_free (folder_dir); diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h index 0865a52e09..542eb93dea 100644 --- a/camel/providers/imap/camel-imap-store.h +++ b/camel/providers/imap/camel-imap-store.h @@ -29,7 +29,7 @@ #ifdef __cplusplus extern "C" { #pragma } -#endif /* __cplusplus }*/ +#endif /* __cplusplus */ #include "camel-imap-types.h" #include -- cgit v1.2.3