diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-09-22 10:23:44 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-09-22 10:27:56 +0200 |
commit | 2a60a0723257cfd6855233b9af27dc9735915435 (patch) | |
tree | 9dcabe95cff050ad77f7bca03c4b85e51c4ffa10 /framework/src/frameworkplugin.cpp | |
parent | 1f1ffbceb15dbc9e8a7ff567666a026ef221039e (diff) | |
download | kube-2a60a0723257cfd6855233b9af27dc9735915435.tar.gz kube-2a60a0723257cfd6855233b9af27dc9735915435.zip |
Keyring fixes
* Avoid double free
* track unlocked state
* Ensure we bring up the login screen on startup and after saving the
configuration.
Diffstat (limited to 'framework/src/frameworkplugin.cpp')
-rw-r--r-- | framework/src/frameworkplugin.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/framework/src/frameworkplugin.cpp b/framework/src/frameworkplugin.cpp index 1e1a169e..c4f7e85d 100644 --- a/framework/src/frameworkplugin.cpp +++ b/framework/src/frameworkplugin.cpp | |||
@@ -60,7 +60,9 @@ static QObject *keyring_singletontype_provider(QQmlEngine *engine, QJSEngine *sc | |||
60 | { | 60 | { |
61 | Q_UNUSED(engine) | 61 | Q_UNUSED(engine) |
62 | Q_UNUSED(scriptEngine) | 62 | Q_UNUSED(scriptEngine) |
63 | return new Kube::Keyring; | 63 | auto instance = Kube::Keyring::instance(); |
64 | QQmlEngine::setObjectOwnership(instance, QQmlEngine::CppOwnership); | ||
65 | return instance; | ||
64 | } | 66 | } |
65 | 67 | ||
66 | void FrameworkPlugin::registerTypes (const char *uri) | 68 | void FrameworkPlugin::registerTypes (const char *uri) |