Commit f7d622c6 authored by Pekka Vuorela's avatar Pekka Vuorela

[qml-plugin-systemsettings] Disable developer mode account check for now. Contributes to JB#39097

Cannot use sailfishaccounts on nemo side. Need to figure out better
ways before getting into release level.
parent bccb2fa5
......@@ -26,7 +26,7 @@ BuildRequires: pkgconfig(nemomodels-qt5)
BuildRequires: pkgconfig(libsailfishkeyprovider) >= 0.0.14
BuildRequires: pkgconfig(connman-qt5)
BuildRequires: pkgconfig(ssu-sysinfo) >= 1.1.0
BuildRequires: pkgconfig(sailfishaccounts)
#BuildRequires: pkgconfig(sailfishaccounts)
%description
%{summary}.
......
......@@ -32,10 +32,12 @@
#include "developermodesettings.h"
#if 0
/* libsailfishaccounts */
#include <accountmanager.h>
#include <provider.h>
#include <service.h>
#endif
#include <QDebug>
#include <QFile>
......@@ -160,7 +162,7 @@ DeveloperModeSettings::DeveloperModeSettings(QObject *parent)
: QObject(parent)
, m_usbModeDaemon(USB_MODED_SERVICE, USB_MODED_PATH, USB_MODED_INTERFACE,
QDBusConnection::systemBus())
, m_accountManager(new AccountManager(this))
// , m_accountManager(new AccountManager(this))
, m_pendingPackageKitCall(nullptr)
, m_packageKitCommand(nullptr)
, m_wlanIpAddress("-")
......@@ -182,9 +184,11 @@ DeveloperModeSettings::DeveloperModeSettings(QObject *parent)
qWarning() << "Failed to return username using getpwuid()";
}
#if 0
updateAccountProvider();
connect(m_accountManager, &AccountManager::providerNamesChanged,
this, &DeveloperModeSettings::updateAccountProvider);
#endif
if (!m_developerModeEnabled) {
m_workerStatus = CheckingStatus;
......@@ -652,6 +656,7 @@ void DeveloperModeSettings::transactionFinished(uint, uint)
emit workerProgressChanged();
}
#if 0
void DeveloperModeSettings::updateAccountProvider()
{
// Find all account providers with the developer-mode service. If m_developerModeAccountProvider
......@@ -682,3 +687,4 @@ void DeveloperModeSettings::updateAccountProvider()
}
}
}
#endif
......@@ -142,8 +142,8 @@ private:
void executePackageKitCommand(
QDBusPendingCallWatcher *(DeveloperModeSettings::*command)(const QString &),
const QString &argument);
void updateAccountProvider();
//
// void updateAccountProvider();
QDBusInterface m_usbModeDaemon;
QDBusObjectPath m_packageKitTransaction;
......
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