git.iko.soy/unity8
on xenial help sign in
Switch properties to system schema, instead of our own
0a3f1ddMichael Terry
debian/control+1−1
compare with xenial
unifiedsplit
@@ -167,7 +167,7 @@ Package: unity8-private
167Architecture: any
167Architecture: any
168Multi-Arch: same
168Multi-Arch: same
169Pre-Depends: ${misc:Pre-Depends},
169Pre-Depends: ${misc:Pre-Depends},
170−Depends: accountsservice-ubuntu-schemas,
170+Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
171 gsettings-ubuntu-schemas,
171 gsettings-ubuntu-schemas,
172 libhardware2,
172 libhardware2,
173 libunity-core-6.0-9,
173 libunity-core-6.0-9,
plugins/AccountsService/AccountsService.cpp+8−8
@@ -104,7 +104,7 @@ void AccountsService::updateDemoEdges()
104
104
105void AccountsService::updateEnableLauncherWhileLocked()
105void AccountsService::updateEnableLauncherWhileLocked()
106{
106{
107− auto enableLauncherWhileLocked = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "EnableLauncherWhileLocked").toBool();
107+ auto enableLauncherWhileLocked = m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableLauncherWhileLocked").toBool();
108 if (m_enableLauncherWhileLocked != enableLauncherWhileLocked) {
108 if (m_enableLauncherWhileLocked != enableLauncherWhileLocked) {
109 m_enableLauncherWhileLocked = enableLauncherWhileLocked;
109 m_enableLauncherWhileLocked = enableLauncherWhileLocked;
110 Q_EMIT enableLauncherWhileLockedChanged();
110 Q_EMIT enableLauncherWhileLockedChanged();
@@ -113,7 +113,7 @@ void AccountsService::updateEnableLauncherWhileLocked()
113
113
114void AccountsService::updateEnableIndicatorsWhileLocked()
114void AccountsService::updateEnableIndicatorsWhileLocked()
115{
115{
116− auto enableIndicatorsWhileLocked = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "EnableIndicatorsWhileLocked").toBool();
116+ auto enableIndicatorsWhileLocked = m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableIndicatorsWhileLocked").toBool();
117 if (m_enableIndicatorsWhileLocked != enableIndicatorsWhileLocked) {
117 if (m_enableIndicatorsWhileLocked != enableIndicatorsWhileLocked) {
118 m_enableIndicatorsWhileLocked = enableIndicatorsWhileLocked;
118 m_enableIndicatorsWhileLocked = enableIndicatorsWhileLocked;
119 Q_EMIT enableIndicatorsWhileLockedChanged();
119 Q_EMIT enableIndicatorsWhileLockedChanged();
@@ -177,12 +177,6 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte
177 if (changed.contains("demo-edges")) {
177 if (changed.contains("demo-edges")) {
178 updateDemoEdges();
178 updateDemoEdges();
179 }
179 }
180− if (changed.contains("EnableLauncherWhileLocked")) {
181− updateEnableLauncherWhileLocked();
182− }
183− if (changed.contains("EnableIndicatorsWhileLocked")) {
184− updateEnableIndicatorsWhileLocked();
185− }
186 } else if (interface == "com.canonical.unity.AccountsService.Private") {
180 } else if (interface == "com.canonical.unity.AccountsService.Private") {
187 if (changed.contains("FailedLogins")) {
181 if (changed.contains("FailedLogins")) {
188 updateFailedLogins();
182 updateFailedLogins();
@@ -195,6 +189,12 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte
195 if (changed.contains("PasswordDisplayHint")) {
189 if (changed.contains("PasswordDisplayHint")) {
196 updatePasswordDisplayHint();
190 updatePasswordDisplayHint();
197 }
191 }
192+ if (changed.contains("EnableLauncherWhileLocked")) {
193+ updateEnableLauncherWhileLocked();
194+ }
195+ if (changed.contains("EnableIndicatorsWhileLocked")) {
196+ updateEnableIndicatorsWhileLocked();
197+ }
198 }
198 }
199}
199}
200
200
plugins/AccountsService/com.canonical.unity.AccountsService.xml−8
@@ -9,14 +9,6 @@
9 <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
9 <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
10 value="com.ubuntu.AccountsService.GreeterChangeAny"/>
10 value="com.ubuntu.AccountsService.GreeterChangeAny"/>
11
11
12− <property name="EnableLauncherWhileLocked" type="b" access="readwrite">
13− <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
14− </property>
15−
16− <property name="EnableIndicatorsWhileLocked" type="b" access="readwrite">
17− <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
18− </property>
19−
20 <!-- Should have been named DemoEdges, sorry folks. -mterry -->
12 <!-- Should have been named DemoEdges, sorry folks. -mterry -->
21 <property name="demo-edges" type="b" access="readwrite">
13 <property name="demo-edges" type="b" access="readwrite">
22 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
14 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>