0fd4b67 · unity8 · git.iko.soy

git.iko.soy/unity8

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

commit0fd4b67da4b53e92a2d66a28d475fe8d0a089067 authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 2 Sep 2013, 13:24 (13 years ago) parent3ae5f76

2 files changed+9−5

compare with xenial

unifiedsplit

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

Shell.qml+1−1

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

469469 onSelected: {

470470 // Update launcher items for new user

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

472− //LauncherModel.setUser(user);

472+ LauncherModel.setUser(user);

473473 }

474474

475475 onLeftTeaserPressedChanged: {

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

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

4242 if (useStorage) {

4343 m_accounts = new AccountsService(this);

4444 }

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

45+ m_user = qgetenv("USER");

46+ syncFromAccounts();

4647}

4748

4849LauncherBackend::~LauncherBackend()

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

179180 Q_UNUSED(appId)

180181 return 0;

181182}

182−

183+#include <QDebug>

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

184185{

185− m_user = username;

186− syncFromAccounts();

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

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

188+ m_user = username;

189+ syncFromAccounts();

190+ }

187191}

188192

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