diff options
| author | Peter Williams <peterw@ximian.com> | 2002-07-27 01:03:02 +0800 |
|---|---|---|
| committer | Peter Williams <peterw@src.gnome.org> | 2002-07-27 01:03:02 +0800 |
| commit | 1363bc081251558d0490ecbbecb151fba008fc59 (patch) | |
| tree | cb35d7a174760a509150f24d7d6cbc8a62694583 | |
| parent | e40b1868be45996f361fce9c1ea30dacd03306b2 (diff) | |
| download | gsoc2013-evolution-1363bc081251558d0490ecbbecb151fba008fc59.tar gsoc2013-evolution-1363bc081251558d0490ecbbecb151fba008fc59.tar.gz gsoc2013-evolution-1363bc081251558d0490ecbbecb151fba008fc59.tar.bz2 gsoc2013-evolution-1363bc081251558d0490ecbbecb151fba008fc59.tar.lz gsoc2013-evolution-1363bc081251558d0490ecbbecb151fba008fc59.tar.xz gsoc2013-evolution-1363bc081251558d0490ecbbecb151fba008fc59.tar.zst gsoc2013-evolution-1363bc081251558d0490ecbbecb151fba008fc59.zip | |
Revert Jeff's previous change, it broke local folders. Uninitialized
2002-07-26 Peter Williams <peterw@ximian.com>
* Revert Jeff's previous change, it broke local
folders. Uninitialized exceptions or something.
svn path=/trunk/; revision=17605
| -rw-r--r-- | camel/ChangeLog | 5 | ||||
| -rw-r--r-- | camel/providers/local/camel-local-store.c | 4 | ||||
| -rw-r--r-- | camel/providers/local/camel-maildir-store.c | 5 | ||||
| -rw-r--r-- | camel/providers/local/camel-mbox-store.c | 7 | ||||
| -rw-r--r-- | camel/providers/local/camel-mh-store.c | 8 |
5 files changed, 18 insertions, 11 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index e949f611f0..fd5a7d2790 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2002-07-26 Peter Williams <peterw@ximian.com> + + * Revert Jeff's previous change, it broke local + folders. Uninitialized exceptions or something. + 2002-07-25 Jeffrey Stedfast <fejj@ximian.com> If we're gonna do an elite hack, lets do it right. diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c index 419bfdae72..a0d3708346 100644 --- a/camel/providers/local/camel-local-store.c +++ b/camel/providers/local/camel-local-store.c @@ -174,8 +174,8 @@ get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelExce if (slash) *slash = '/'; } while (slash); - - return (CamelFolder *) 0xdeadbeef; + + return NULL; } static CamelFolder * diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c index f7f267e0be..caae276e14 100644 --- a/camel/providers/local/camel-maildir-store.c +++ b/camel/providers/local/camel-maildir-store.c @@ -91,9 +91,10 @@ static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guin struct stat st; CamelFolder *folder = NULL; - if (!((CamelStoreClass *)parent_class)->get_folder(store, folder_name, flags, ex)) + (void) ((CamelStoreClass *)parent_class)->get_folder(store, folder_name, flags, ex); + if (camel_exception_is_set(ex)) return NULL; - + name = g_strdup_printf("%s%s", CAMEL_LOCAL_STORE(store)->toplevel_dir, folder_name); tmp = g_strdup_printf("%s/tmp", name); cur = g_strdup_printf("%s/cur", name); diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c index df6709c699..3333580766 100644 --- a/camel/providers/local/camel-mbox-store.c +++ b/camel/providers/local/camel-mbox-store.c @@ -80,10 +80,11 @@ get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelExcep { char *name; struct stat st; - - if (!((CamelStoreClass *)parent_class)->get_folder(store, folder_name, flags, ex)) + + (void) ((CamelStoreClass *)parent_class)->get_folder(store, folder_name, flags, ex); + if (camel_exception_is_set(ex)) return NULL; - + name = g_strdup_printf("%s%s", CAMEL_LOCAL_STORE(store)->toplevel_dir, folder_name); if (stat(name, &st) == -1) { diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c index 8f98e7a86b..f653fdb408 100644 --- a/camel/providers/local/camel-mh-store.c +++ b/camel/providers/local/camel-mh-store.c @@ -185,15 +185,15 @@ fail: camel_object_unref(out); } -static CamelFolder * -get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex) +static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex) { char *name; struct stat st; - if (!((CamelStoreClass *)parent_class)->get_folder(store, folder_name, flags, ex)) + (void) ((CamelStoreClass *)parent_class)->get_folder(store, folder_name, flags, ex); + if (camel_exception_is_set(ex)) return NULL; - + name = g_strdup_printf("%s%s", CAMEL_LOCAL_STORE(store)->toplevel_dir, folder_name); if (stat(name, &st) == -1) { |