Skip to content

Commit

Permalink
[qml-plugin-systemsettings] Disable developer mode account check for …
Browse files Browse the repository at this point in the history
…now. Contributes to JB#39097

Cannot use sailfishaccounts on nemo side. Need to figure out better
ways before getting into release level.
  • Loading branch information
pvuorela committed Mar 13, 2018
1 parent bccb2fa commit f7d622c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion rpm/nemo-qml-plugin-systemsettings.spec
Expand Up @@ -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}.
Expand Down
8 changes: 7 additions & 1 deletion src/developermodesettings.cpp
Expand Up @@ -32,10 +32,12 @@

#include "developermodesettings.h"

#if 0
/* libsailfishaccounts */
#include <accountmanager.h>
#include <provider.h>
#include <service.h>
#endif

#include <QDebug>
#include <QFile>
Expand Down Expand Up @@ -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("-")
Expand All @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -682,3 +687,4 @@ void DeveloperModeSettings::updateAccountProvider()
}
}
}
#endif
4 changes: 2 additions & 2 deletions src/developermodesettings.h
Expand Up @@ -142,8 +142,8 @@ private slots:
void executePackageKitCommand(
QDBusPendingCallWatcher *(DeveloperModeSettings::*command)(const QString &),
const QString &argument);

void updateAccountProvider();
//
// void updateAccountProvider();

QDBusInterface m_usbModeDaemon;
QDBusObjectPath m_packageKitTransaction;
Expand Down

0 comments on commit f7d622c

Please sign in to comment.