From fd7cff5da4b33be1e7606c516f7dda00397600b8 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 14 Nov 2016 13:25:44 +0100
Subject: Made the use of the folder struct a bit more expressive

---
 examples/imapresource/imapserverproxy.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'examples/imapresource/imapserverproxy.cpp')

diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index 56ddf89..d6f0c7f 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -157,6 +157,8 @@ KAsync::Job<SelectResult> ImapServerProxy::select(const QString &mailbox)
     select->setCondstoreEnabled(mCapabilities.contains("CONDSTORE"));
     return runJob<SelectResult>(select, [select](KJob* job) -> SelectResult {
         return {select->uidValidity(), select->nextUid(), select->highestModSequence()};
+    }).onError([=] (const KAsync::Error &error) {
+        SinkWarning() << "Select failed: " << mailbox;
     });
 }
 
@@ -388,17 +390,16 @@ KAsync::Job<void> ImapServerProxy::fetchFolders(std::function<void(const Folder
     return list(KIMAP2::ListJob::IncludeUnsubscribed, [callback](const KIMAP2::MailBoxDescriptor &mailbox, const QList<QByteArray> &flags){
             bool noselect = flags.contains(QByteArray(FolderFlags::Noselect).toLower()) || flags.contains(QByteArray(FolderFlags::Noselect));
             SinkLog() << "Found mailbox: " << mailbox.name << flags << FolderFlags::Noselect << noselect;
-            callback(Folder{mailbox.name.split(mailbox.separator), mailbox.name, mailbox.separator, noselect});
+            callback(Folder{mailbox.name, mailbox.separator, noselect});
     });
 }
 
 QString ImapServerProxy::mailboxFromFolder(const Folder &folder) const
 {
-    if (folder.path.isEmpty()) {
-        Q_ASSERT(!mPersonalNamespaceSeparator.isNull());
-        return folder.pathParts.join(mPersonalNamespaceSeparator);
+    if (folder.path().isEmpty()) {
+        return folder.path(mPersonalNamespaceSeparator);
     } else {
-        return folder.path;
+        return folder.path();
     }
 }
 
-- 
cgit v1.2.3