0fd4b67 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

reenable setUser, but only allowing doing that in the greeter session

0fd4b67Michael Zanetti13 years ago

Shell.qml+1−1

compare with xenial

unifiedsplit

@@ -469,7 +469,7 @@ FocusScope {

469 onSelected: {

470 // Update launcher items for new user

471 var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);

472− //LauncherModel.setUser(user);

472+ LauncherModel.setUser(user);

473 }

474

475 onLeftTeaserPressedChanged: {

plugins/Unity/Launcher/backend/launcherbackend.cpp+8−4

@@ -42,7 +42,8 @@ LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):

42 if (useStorage) {

43 m_accounts = new AccountsService(this);

44 }

45− setUser(qgetenv("USER"));

45+ m_user = qgetenv("USER");

46+ syncFromAccounts();

46}

47}

48LauncherBackend::~LauncherBackend()

49LauncherBackend::~LauncherBackend()

@@ -179,11 +180,14 @@ int LauncherBackend::count(const QString &appId) const

179 Q_UNUSED(appId)

180 Q_UNUSED(appId)

180 return 0;

181 return 0;

181}

182}

182−

183+#include <QDebug>

183void LauncherBackend::setUser(const QString &username)

184void LauncherBackend::setUser(const QString &username)

184{

185{

186+ if (qgetenv("USER") == "lightdm" && m_user != username) {

187+ qDebug() << "setting user";

185− m_user = username;

188+ m_user = username;

186− syncFromAccounts();

189+ syncFromAccounts();

190+ }

187}

191}

188

192

189void LauncherBackend::triggerQuickListAction(const QString &appId, const QString &quickListId)

193void LauncherBackend::triggerQuickListAction(const QString &appId, const QString &quickListId)