aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2002-05-22 04:54:18 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-05-22 04:54:18 +0800
commitbec22b99bb0c5afa61934c09b2bd633775a19c7e (patch)
tree31a93f001a0876261d2c9e68f6f58d51392283e5 /camel
parentb5e7d4eaf2667d3a47ee716f281de031712985df (diff)
downloadgsoc2013-evolution-bec22b99bb0c5afa61934c09b2bd633775a19c7e.tar
gsoc2013-evolution-bec22b99bb0c5afa61934c09b2bd633775a19c7e.tar.gz
gsoc2013-evolution-bec22b99bb0c5afa61934c09b2bd633775a19c7e.tar.bz2
gsoc2013-evolution-bec22b99bb0c5afa61934c09b2bd633775a19c7e.tar.lz
gsoc2013-evolution-bec22b99bb0c5afa61934c09b2bd633775a19c7e.tar.xz
gsoc2013-evolution-bec22b99bb0c5afa61934c09b2bd633775a19c7e.tar.zst
gsoc2013-evolution-bec22b99bb0c5afa61934c09b2bd633775a19c7e.zip
Don't call some retarded function to simply set an exception.
2002-05-16 Jeffrey Stedfast <fejj@ximian.com> * 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
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog3
-rw-r--r--camel/providers/imap/camel-imap-folder.h2
-rw-r--r--camel/providers/imap/camel-imap-store.c8
-rw-r--r--camel/providers/imap/camel-imap-store.h2
4 files changed, 11 insertions, 4 deletions
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 <fejj@ximian.com>
+ * 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 <camel/camel-disco-folder.h>
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 <camel/camel-disco-store.h>