diff --git a/CHANGELOG b/CHANGELOG index 95f0c57..e43c87f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +Ver.1.4.4 +--------- +* dataengine + - fix profile status definition + Ver.1.4.3 --------- * all diff --git a/arch/PKGBUILD b/arch/PKGBUILD index 6becced..3a7f427 100644 --- a/arch/PKGBUILD +++ b/arch/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=netctl-gui pkgname=('libnetctlgui' 'netctlgui-helper' 'netctl-gui' 'plasma5-applet-netctl-gui') -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=1 pkgdesc="Qt4/Qt5 GUI for netctl. Also provides a widget for KDE" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://arcanis.name/projects/netctl-gui" license=('GPL3') makedepends=('cmake' 'extra-cmake-modules' 'plasma-framework' 'qt5-tools') source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz") -md5sums=('65a62753c03e2996a05d930c0ec2d460') +md5sums=('ea5eb54bf0ad29f392c8fe6e5ea2585e') prepare() { rm -rf "${srcdir}/build-"{plasmoid,qt5} diff --git a/arch/PKGBUILD-qt4 b/arch/PKGBUILD-qt4 index 13b080d..c220b09 100644 --- a/arch/PKGBUILD-qt4 +++ b/arch/PKGBUILD-qt4 @@ -4,7 +4,7 @@ pkgbase=netctl-gui-qt4 _pkgbase=netctl-gui pkgname=('libnetctlgui-qt4' 'netctlgui-helper-qt4' 'netctl-gui-qt4' 'kdeplasma-applets-netctl-gui') -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=1 pkgdesc="Qt4 GUI for netctl. Also provides a widget for KDE4" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://arcanis.name/projects/netctl-gui" license=('GPL3') makedepends=('automoc4' 'cmake' 'kdelibs') source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${_pkgbase}-${pkgver}-src.tar.xz") -md5sums=('65a62753c03e2996a05d930c0ec2d460') +md5sums=('ea5eb54bf0ad29f392c8fe6e5ea2585e') prepare() { diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 57bf44d..f1142e2 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -11,7 +11,7 @@ set (PROJECT_CONTACT "esalexeev@gmail.com") set (PROJECT_LICENSE "GPLv3") set (PROJECT_VERSION_MAJOR 1) set (PROJECT_VERSION_MINOR 4) -set (PROJECT_VERSION_PATCH 3) +set (PROJECT_VERSION_PATCH 4) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC) string (TIMESTAMP CURRENT_YEAR "%Y") diff --git a/sources/dataengine/netctl.cpp b/sources/dataengine/netctl.cpp index 8b4566e..3460826 100644 --- a/sources/dataengine/netctl.cpp +++ b/sources/dataengine/netctl.cpp @@ -198,16 +198,15 @@ QStringList Netctl::getProfileList(const QString cmdNetctl, const QString cmdNet if (debug) qDebug() << PDEBUG; netctlAutoStatus = true; - QString output = getCmdOutput(QString("%1 list").arg(cmdNetctlAuto)); + QString output = getCmdOutput(QString("%1 list").arg(cmdNetctlAuto)).trimmed(); if (output.isEmpty()) { - output = getCmdOutput(QString("%1 list").arg(cmdNetctl)); + output = getCmdOutput(QString("%1 list").arg(cmdNetctl)).trimmed(); netctlAutoStatus = false; } - qDebug() << output; // parse QStringList currentProfiles; - QStringList profileList = output.split(QChar('\n'), QString::SkipEmptyParts); + QStringList profileList = output.split(QChar('\n')); for (int i=0; i