[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=9c13e92

The following commit has been merged in the master branch:
commit 9c13e92e55bdcb34d49d8ea012c86cbdcd222b61
Author: Àlex Fiestas <afiestas at kde.org>
Date:   Mon Sep 22 01:23:47 2014 +0200

    Port KCM to QStandardPaths
    
    Both core return the same.
---
 kcm/kcm.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
index d51b203..1daa0f8 100644
--- a/kcm/kcm.cpp
+++ b/kcm/kcm.cpp
@@ -33,7 +33,6 @@
 #include <KPluginInfo>
 #include <KPluginFactory>
 #include <KAboutData>
-#include <KStandardDirs>
 #include <KLocalizedString>
 
 
@@ -155,7 +154,7 @@ void KdeConnectKcm::deviceSelected(const QModelIndex& current)
     KService::List offers = KServiceTypeTrader::self()->query("KdeConnect/Plugin");
     QList<KPluginInfo> scriptinfos = KPluginInfo::fromServices(offers);
 
-    QString path = KStandardDirs().resourceDirs("config").first()+"kdeconnect/";
+    QString path = QStandardPaths::locate(QStandardPaths::ConfigLocation, "kdeconnect/", QStandardPaths::LocateDirectory);
     KSharedConfigPtr deviceConfig = KSharedConfig::openConfig(path + currentDevice->id());
     kcmUi->pluginSelector->addPlugins(scriptinfos, KPluginSelector::ReadConfigFile, i18n("Plugins"), QString(), deviceConfig);
 

-- 
kdeconnect packaging