[evolution-ews] ews_get_folder_sync: Remove CAMEL_STORE_FOLDER_CREATE branch.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews] ews_get_folder_sync: Remove CAMEL_STORE_FOLDER_CREATE branch.
- Date: Mon, 3 Mar 2014 17:33:12 +0000 (UTC)
commit 26374762ee055c0056d83c40fb1c5cb04fa7fedd
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Mar 3 12:28:43 2014 -0500
ews_get_folder_sync: Remove CAMEL_STORE_FOLDER_CREATE branch.
CamelStore now handles this flag directly; subclasses will never receive
it. Also, set the proper GError code for "no such folder" errors.
src/camel/camel-ews-store.c | 30 ++----------------------------
1 files changed, 2 insertions(+), 28 deletions(-)
---
diff --git a/src/camel/camel-ews-store.c b/src/camel/camel-ews-store.c
index e9749a2..c20303d 100644
--- a/src/camel/camel-ews-store.c
+++ b/src/camel/camel-ews-store.c
@@ -1952,36 +1952,10 @@ ews_get_folder_sync (CamelStore *store,
fid = camel_ews_store_summary_get_folder_id_from_name (ews_store->summary, folder_name);
- /* We don't support CAMEL_STORE_FOLDER_EXCL. Nobody ever uses it */
- if (!fid && (flags & CAMEL_STORE_FOLDER_CREATE)) {
- CamelFolderInfo *fi;
- const gchar *parent, *top, *slash;
- gchar *copy = NULL;
-
- slash = strrchr (folder_name, '/');
- if (slash) {
- copy = g_strdup (folder_name);
-
- /* Split into parent path, and new name */
- copy[slash - folder_name] = 0;
- parent = copy;
- top = copy + (slash - folder_name) + 1;
- } else {
- parent = "";
- top = folder_name;
- }
-
- fi = ews_create_folder_sync (store, parent, top, cancellable, error);
- g_free (copy);
-
- if (!fi)
- return NULL;
-
- camel_folder_info_free (fi);
- } else if (!fid) {
+ if (!fid) {
g_set_error (
error, CAMEL_STORE_ERROR,
- CAMEL_ERROR_GENERIC,
+ CAMEL_STORE_ERROR_NO_FOLDER,
_("No such folder: %s"), folder_name);
return NULL;
} else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]