From 8318b29b81d9a98fc5ad5fe1550f6d7a46ca7296 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 15 Mar 2016 10:50:50 +0100
Subject: Fixed loading of account names.

---
 framework/domain/accountsmodel.cpp | 2 +-
 framework/settings/settings.cpp    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'framework')

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;
-- 
cgit v1.2.3