From bd9c640bf83b6a430cd4d7e91376aab7222ce07a Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Sat, 12 Mar 2016 15:29:11 +0100 Subject: Set the accountId on the settings component. --- accounts/maildir/maildirsettings.cpp | 9 +++++++-- components/package/contents/ui/Settings.qml | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/accounts/maildir/maildirsettings.cpp b/accounts/maildir/maildirsettings.cpp index a2e2e96e..58ff77fd 100644 --- a/accounts/maildir/maildirsettings.cpp +++ b/accounts/maildir/maildirsettings.cpp @@ -49,10 +49,14 @@ QByteArray MaildirSettings::identifier() const void MaildirSettings::setAccountIdentifier(const QByteArray &id) { + if (id.isEmpty()) { + return; + } mAccountIdentifier = id; + Q_ASSERT(!id.isEmpty()); Kube::Account account(id); - account.property("maildirResource").toByteArray(); - setIdentifier(account.property("maildirResource").toByteArray()); + auto maildirResource = account.property("maildirResource").toByteArray(); + setIdentifier(maildirResource); } QByteArray MaildirSettings::accountIdentifier() const @@ -88,6 +92,7 @@ void MaildirSettings::save() resource.setProperty("identifier", resourceIdentifier); resource.setProperty("type", "org.kde.maildir"); Sink::Store::create(resource).exec(); + Q_ASSERT(!mAccountIdentifier.isEmpty()); Kube::Account account(mAccountIdentifier); account.setProperty("maildirResource", resourceIdentifier); account.save(); diff --git a/components/package/contents/ui/Settings.qml b/components/package/contents/ui/Settings.qml index e0d993ad..d96ccfb0 100644 --- a/components/package/contents/ui/Settings.qml +++ b/components/package/contents/ui/Settings.qml @@ -99,8 +99,9 @@ Rectangle { } onClicked: { - console.warn("Loading module is ", accountFactory.acountId); + console.warn("Loading module is ", accountFactory.accountId); accountDetails.source = accountFactory.uiPath + accountDetails.item.accountId = accountFactory.accountId listView.currentIndex = model.index } } -- cgit v1.2.3