Hrvoje Senjan 2015-06-28 19:14:35 +00:00 committed by Git OBS Bridge
parent 586870fa4d
commit de9ed1be57

View File

@ -1,42 +0,0 @@
From 660eb9412a274e28ce13b7091b0e6e7620e5d68b Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Thu, 28 May 2015 16:37:44 +0200
Subject: [PATCH 1/5] Bugzilla Integration: Look for the mappings file in the
correct location
The "mappings" file is not installed in the 'GenericDataLocation', it is
installed under the drkonqi prefix in /usr/share/. We should look for it
in the correct place.
Reviewed-By: Aleix Pol
Cherry-picked from b67f43013426
---
drkonqi/bugzillaintegration/productmapping.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drkonqi/bugzillaintegration/productmapping.cpp b/drkonqi/bugzillaintegration/productmapping.cpp
index 96cac5fbceb05168e7a57ed00a94e3c6d4c6bfec..2dcbf7bbfa52dc66fc1f4374a1eadd73ee46add9 100644
--- a/drkonqi/bugzillaintegration/productmapping.cpp
+++ b/drkonqi/bugzillaintegration/productmapping.cpp
@@ -57,7 +57,7 @@ void ProductMapping::map(const QString & appName)
void ProductMapping::mapUsingInternalFile(const QString & appName)
{
- KConfig mappingsFile(QString::fromLatin1("mappings"), KConfig::NoGlobals, QStandardPaths::GenericDataLocation);
+ KConfig mappingsFile(QString::fromLatin1("mappings"), KConfig::NoGlobals, QStandardPaths::DataLocation);
const KConfigGroup mappings = mappingsFile.group("Mappings");
if (mappings.hasKey(appName)) {
QString mappingString = mappings.readEntry(appName);
@@ -82,7 +82,7 @@ void ProductMapping::getRelatedProductsUsingInternalFile(const QString & bugzill
//ProductGroup -> kontact=kdepim
//Groups -> kdepim=kontact|kmail|korganizer|akonadi|pimlibs..etc
- KConfig mappingsFile(QString::fromLatin1("mappings"), KConfig::NoGlobals, QStandardPaths::GenericDataLocation);
+ KConfig mappingsFile(QString::fromLatin1("mappings"), KConfig::NoGlobals, QStandardPaths::DataLocation);
const KConfigGroup productGroup = mappingsFile.group("ProductGroup");
//Get groups of the application
--
2.4.1