From 71410382a4cb67f039524d69fe8f35e49d0b253a Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Tue, 27 Sep 2016 21:20:10 +0900
Subject: [PATCH] Import user configs
---
src/handlers/xdgurl.cpp | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/handlers/xdgurl.cpp b/src/handlers/xdgurl.cpp
index 6cf2f4f..08d21f5 100644
--- a/src/handlers/xdgurl.cpp
+++ b/src/handlers/xdgurl.cpp
@@ -112,11 +112,19 @@ QJsonObject XdgUrl::_importDestinations()
QJsonObject XdgUrl::_importArchiveTypes()
{
- //QJsonObject archiveTypes;
- //QJsonObject appConfigArchiveTypes = _appConfig->get("archive_types");
+ QJsonObject archiveTypes;
+ QJsonObject appConfigArchiveTypes = _appConfig->get("archive_types");
+ QJsonObject userConfigArchiveTypes = _userConfig->get("archive_types");
- //return archiveTypes;
- return _appConfig->get("archive_types");
+ archiveTypes = appConfigArchiveTypes;
+
+ if (!userConfigArchiveTypes.isEmpty()) {
+ foreach (const QString key, userConfigArchiveTypes.keys()) {
+ archiveTypes[key] = userConfigArchiveTypes.value(key);
+ }
+ }
+
+ return archiveTypes;
}
bool XdgUrl::_installPlasmapkg(const QString &path, const QString &type)
--
GitLab