[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [akonadi] src: Fix loading and saving the configuration
From:       Daniel_Vrátil <null () kde ! org>
Date:       2018-08-17 18:10:21
Message-ID: E1fqjCX-0003GK-Uo () code ! kde ! org
[Download RAW message or body]

Git commit 812d92e8612c773eef630c76b2f57741be9c2d02 by Daniel Vrátil.
Committed on 17/08/2018 at 18:10.
Pushed by dvratil into branch 'master'.

Fix loading and saving the configuration

M  +1    -0    src/core/agentconfigurationbase.cpp
M  +6    -2    src/widgets/agentconfigurationwidget.cpp

https://commits.kde.org/akonadi/812d92e8612c773eef630c76b2f57741be9c2d02

diff --git a/src/core/agentconfigurationbase.cpp \
b/src/core/agentconfigurationbase.cpp index 063b2ccda..74f72f3dd 100644
--- a/src/core/agentconfigurationbase.cpp
+++ b/src/core/agentconfigurationbase.cpp
@@ -79,6 +79,7 @@ void AgentConfigurationBase::load()
 bool AgentConfigurationBase::save() const
 {
     d->config->sync();
+    d->config->reparseConfiguration();
     return true;
 }
 
diff --git a/src/widgets/agentconfigurationwidget.cpp \
b/src/widgets/agentconfigurationwidget.cpp index 72031ae24..d3f34bcfd 100644
--- a/src/widgets/agentconfigurationwidget.cpp
+++ b/src/widgets/agentconfigurationwidget.cpp
@@ -84,6 +84,7 @@ bool AgentConfigurationWidget::Private::loadPlugin(const QString \
&pluginPath)  return false;
     }
 
+    qCDebug(AKONADIWIDGETS_LOG) << "Loaded agent configuration plugin" << \
pluginPath;  return true;
 }
 
@@ -95,8 +96,9 @@ AgentConfigurationWidget::AgentConfigurationWidget(const \
                AgentInstance &instance
     if (AgentConfigurationManager::self()->registerInstanceConfiguration(instance.identifier())) \
                {
         const auto pluginPath = \
AgentConfigurationManager::self()->findConfigPlugin(instance.type().identifier());  \
                if (d->loadPlugin(pluginPath)) {
-            const auto configPath = \
                ServerManager::self()->agentConfigFilePath(instance.identifier());
-            KSharedConfigPtr config = KSharedConfig::openConfig(configPath);
+            QString configName = instance.identifier() + QStringLiteral("rc");
+            configName = Akonadi::ServerManager::addNamespace(configName);
+            KSharedConfigPtr config = KSharedConfig::openConfig(configName);
             d->plugin = d->factory->create(config, this, { instance.identifier() });
         } else {
             // Hide this dialog and fallback to calling the out-of-process \
configuration @@ -120,6 +122,8 @@ \
AgentConfigurationWidget::AgentConfigurationWidget(const AgentInstance &instance  } \
                else {
         d->setupErrorWidget(this, i18n("Failed to register %1 configuration \
dialog.", instance.name()));  }
+
+    QTimer::singleShot(0, this, &AgentConfigurationWidget::load);
 }
 
 AgentConfigurationWidget::~AgentConfigurationWidget()


[prev in list] [next in list] [prev in thread] [next in thread]