diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-06-30 14:59:10 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-06-30 14:59:56 +0100 |
| commit | 186c5cc577d58087a6ad9eba87807d7f6d089ae4 (patch) | |
| tree | e8d92e2c03a6e5acd43f6a71f8cb71e190dee20b | |
| parent | a5501622f86ad1871cbbcdf761b4bedaa7a881e4 (diff) | |
| download | evolution-data-server-186c5cc577d58087a6ad9eba87807d7f6d089ae4.tar.gz | |
Check for is->cinfo before using it
In the master branch we've fixed this properly but I wasn't brave enough to
backport that yet...
| -rw-r--r-- | camel/providers/imapx/camel-imapx-server.c | 2 | ||||
| -rw-r--r-- | camel/providers/imapx/camel-imapx-store.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c index d67f4c034..cd43bf900 100644 --- a/camel/providers/imapx/camel-imapx-server.c +++ b/camel/providers/imapx/camel-imapx-server.c @@ -3619,7 +3619,7 @@ imapx_job_refresh_info_start (CamelIMAPXServer *is, CamelIMAPXJob *job) } } } else { - if (is->cinfo->capa & IMAPX_CAPABILITY_CONDSTORE) + if (is->cinfo && is->cinfo->capa & IMAPX_CAPABILITY_CONDSTORE) ic = camel_imapx_command_new (is, "STATUS", NULL, "STATUS %f (MESSAGES UNSEEN UIDNEXT HIGHESTMODSEQ)", folder); else ic = camel_imapx_command_new (is, "STATUS", NULL, "STATUS %f (MESSAGES UNSEEN UIDNEXT)", folder); diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c index be086d806..5d12bd2a6 100644 --- a/camel/providers/imapx/camel-imapx-store.c +++ b/camel/providers/imapx/camel-imapx-store.c @@ -915,7 +915,7 @@ add_folders_to_summary (CamelIMAPXStore *istore, GPtrArray *folders, GHashTable new_flags = (si->info.flags & (CAMEL_STORE_INFO_FOLDER_SUBSCRIBED | CAMEL_STORE_INFO_FOLDER_CHECK_FOR_NEW)) | (li->flags & ~CAMEL_STORE_INFO_FOLDER_SUBSCRIBED); - if (!(istore->server->cinfo->capa & IMAPX_CAPABILITY_NAMESPACE)) + if (!istore->server->cinfo || !(istore->server->cinfo->capa & IMAPX_CAPABILITY_NAMESPACE)) istore->dir_sep = li->separator; if (si->info.flags != new_flags) { |