From b243a4d32402553d5152c8d6d8bd90813c5f6d3d Mon Sep 17 00:00:00 2001
From: arcan1s <esalexeev@gmail.com>
Date: Thu, 30 Jan 2014 21:26:04 +0400
Subject: [PATCH] now DE works without any problems

---
 sources/dataengine/netctl.conf | 12 ++++++------
 sources/dataengine/netctl.cpp  | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/sources/dataengine/netctl.conf b/sources/dataengine/netctl.conf
index fb941be..29c1662 100644
--- a/sources/dataengine/netctl.conf
+++ b/sources/dataengine/netctl.conf
@@ -1,18 +1,18 @@
 # Configuration file for netctl data engine
-# Uncomment needed lines
 
 ## Commands
 # command
-#CMD=/usr/bin/netctl
+CMD=/usr/bin/netctl
 # ip command
-#IPCMD=/usr/bin/ip
+IPCMD=/usr/bin/ip
 
 ## Network
 # path to list of network devices
-#NETDIR=/sys/class/net/
+NETDIR=/sys/class/net/
 
 ## External IP
 # external ip check command
-#EXTIPCMD=wget -qO- http://ifconfig.me/ip
+EXTIPCMD=wget -qO- http://ifconfig.me/ip
 # 'true' - check external IP
-#EXTIP=false
+EXTIP=false
+
diff --git a/sources/dataengine/netctl.cpp b/sources/dataengine/netctl.cpp
index 45722e7..5505ff7 100644
--- a/sources/dataengine/netctl.cpp
+++ b/sources/dataengine/netctl.cpp
@@ -105,7 +105,6 @@ bool Netctl::updateSourceEvent(const QString &source)
     QProcess command;
     QString cmdOutput = QString("");
     QString value = QString("");
-    QStringList valueList;
 
     if (source == QString("currentProfile")) {
         command.start(cmd + QString(" list"));
@@ -133,15 +132,15 @@ bool Netctl::updateSourceEvent(const QString &source)
     }
     else if (source == QString("interfaces")) {
         if (QDir(netDir).exists())
-            valueList = QDir(netDir).entryList(QDir::Dirs);
-        setData(source, QString("value"), valueList);
+            value = QDir(netDir).entryList(QDir::Dirs | QDir::NoDotAndDotDot).join(QString(","));
+        setData(source, QString("value"), value);
     }
     else if (source == QString("intIp")) {
         if (QDir(netDir).exists()) {
-            valueList = QDir(netDir).entryList(QDir::Dirs);
-            for (int i=0; i<valueList.count(); i++) {
+            QStringList netDevices = QDir(netDir).entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+            for (int i=0; i<netDevices.count(); i++) {
                 cmdOutput = QString("");
-                command.start(ipCmd + QString("ip addr show ") + valueList[i]);
+                command.start(ipCmd + QString(" addr show ") + netDevices[i]);
                 command.waitForFinished(-1);
                 cmdOutput = command.readAllStandardOutput();
                 if (cmdOutput != QString("")) {
@@ -158,15 +157,17 @@ bool Netctl::updateSourceEvent(const QString &source)
         command.start(cmd + QString(" list"));
         command.waitForFinished(-1);
         cmdOutput = command.readAllStandardOutput();
+        QStringList list;
         if (cmdOutput != QString("")) {
             QStringList profileList = cmdOutput.split(QString("\n"), QString::SkipEmptyParts);
             for (int i=0; i<profileList.count(); i++)
                 if (profileList[i].split(QString(" "), QString::SkipEmptyParts).count() == 1)
-                    valueList.append(profileList[i].split(QString(" "), QString::SkipEmptyParts)[0]);
+                    list.append(profileList[i].split(QString(" "), QString::SkipEmptyParts)[0]);
                 else if (profileList[i].split(QString(" "), QString::SkipEmptyParts).count() == 2)
-                    valueList.append(profileList[i].split(QString(" "), QString::SkipEmptyParts)[1]);
+                    list.append(profileList[i].split(QString(" "), QString::SkipEmptyParts)[1]);
         }
-        setData(source, QString("value"), valueList);
+        value = list.join(QString(","));
+        setData(source, QString("value"), value);
     }
     else if (source == QString("statusBool")) {
         command.start(cmd + QString(" list"));