Fixed loading of account names.

3 files changed, 7 insertions, 7 deletions

diff --git a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
index 3b2dbd35..174683c4 100644
--- a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
+++ b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
@@ -49,8 +49,8 @@ Rectangle {
             id: name
             placeholderText: accountName
             Layout.fillWidth: true
-            text: accountSettings.name
-            onTextChanged: { accountSettings.name = text; }
+            text: accountSettings.accountName
+            onTextChanged: { accountSettings.accountName = text; }
         }
 
         Text {
@@ -152,7 +152,7 @@ Rectangle {
         KubeSettings.Settings {
             id: accountSettings
             identifier: "account." + accountId
-            property string name;
+            property string accountName;
             property string icon: root.icon;
         }
 
diff --git a/framework/domain/accountsmodel.cpp b/framework/domain/accountsmodel.cpp
index 96306464..b5eafd53 100644
--- a/framework/domain/accountsmodel.cpp
+++ b/framework/domain/accountsmodel.cpp
@@ -50,7 +50,7 @@ QVariant AccountsModel::data(const QModelIndex &idx, int role) const
     Kube::Account accountSettings(identifier.toLatin1());
     switch (role) {
         case Name:
-            return accountSettings.property("name").toString();
+            return accountSettings.property("accountName").toString();
         case Icon:
             return accountSettings.property("icon").toString();
         case AccountId:
diff --git a/framework/settings/settings.cpp b/framework/settings/settings.cpp
index 64bc28ba..00d1b9c5 100644
--- a/framework/settings/settings.cpp
+++ b/framework/settings/settings.cpp
@@ -65,14 +65,14 @@ void Settings::save()
 
     for (const auto &p : dynamicPropertyNames()) {
         qWarning() << "setting " << p << property(p);
-        if (p == "identifier") {
+        if (p == "identifier" || p == "name") {
             continue;
         }
         settings->setValue(p, property(p));
     }
     for (int i = metaObject()->propertyOffset(); i < metaObject()->propertyCount(); i++) {
         const auto p = metaObject()->property(i).name();
-        if (p == QByteArray("identifier")) {
+        if (p == QByteArray("identifier") || p == QByteArray("name")) {
             continue;
         }
         qWarning() << "setting " << p << property(p);
@@ -88,7 +88,7 @@ void Settings::remove()
 
 void Settings::load()
 {
-    if (mLoaded) {
+    if (mLoaded || mIdentifier.isEmpty() || mIdentifier.endsWith(".")) {
         return;
     }
     mLoaded = true;