Commit 92572a17 authored by Tomi Leppänen's avatar Tomi Leppänen

Merge branch 'libshadowutils' into 'master'

Remove libshadowutils-dev dependency

See merge request mer-core/nemo-qml-plugin-systemsettings!135
parents 5ef4c999 6b37598a
......@@ -21,7 +21,6 @@ BuildRequires: pkgconfig(profile)
BuildRequires: pkgconfig(mce) >= 1.21.0
BuildRequires: pkgconfig(mlite5)
BuildRequires: pkgconfig(usb-moded-qt5)
BuildRequires: pkgconfig(libshadowutils)
BuildRequires: pkgconfig(blkid)
BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(nemodbus) >= 2.1.16
......
......@@ -41,9 +41,6 @@
#include <QNetworkInterface>
#include <transaction.h>
#include <getdef.h>
#include <pwd.h>
/* Symbolic constants */
#define PROGRESS_INDETERMINATE (-1)
......@@ -103,7 +100,7 @@ DeveloperModeSettings::DeveloperModeSettings(QObject *parent)
, m_wlanIpAddress("-")
, m_usbInterface(USB_NETWORK_FALLBACK_INTERFACE)
, m_usbIpAddress(USB_NETWORK_FALLBACK_IP)
, m_username("nemo")
, m_username(qgetenv("USER"))
, m_developerModeEnabled(QFile::exists(DEVELOPER_MODE_PROVIDED_FILE))
, m_workStatus(Idle)
, m_workProgress(PROGRESS_INDETERMINATE)
......@@ -113,14 +110,6 @@ DeveloperModeSettings::DeveloperModeSettings(QObject *parent)
, m_localInstallFailed(false)
, m_localDeveloperModePackagePath(get_cached_package(QStringLiteral("*"))) // Initialized to possibly incompatible package
{
int uid = getdef_num("UID_MIN", -1);
struct passwd *pwd;
if ((pwd = getpwuid(uid)) != NULL) {
m_username = QString(pwd->pw_name);
} else {
qCWarning(lcDeveloperModeLog) << "Failed to return username using getpwuid()";
}
// Resolve and update local package path
if (!m_localDeveloperModePackagePath.isEmpty()) {
PackageKit::Transaction *resolvePackage = PackageKit::Daemon::resolve(DEVELOPER_MODE_PACKAGE"-preload", PackageKit::Transaction::FilterInstalled);
......
......@@ -6,7 +6,7 @@ QT += qml dbus systeminfo
QT -= gui
CONFIG += c++11 hide_symbols link_pkgconfig
PKGCONFIG += profile mlite5 mce timed-qt5 libshadowutils blkid libcrypto nemomodels-qt5 libsailfishkeyprovider connman-qt5 glib-2.0
PKGCONFIG += profile mlite5 mce timed-qt5 blkid libcrypto nemomodels-qt5 libsailfishkeyprovider connman-qt5 glib-2.0
PKGCONFIG += ssu-sysinfo nemodbus packagekitqt5 libsystemd sailfishusermanager sailfishaccesscontrol
system(qdbusxml2cpp -p mceiface.h:mceiface.cpp mce.xml)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment