on xenial help sign in
Switch properties to system schema, instead of our own
commit0a3f1ddf02dd9ac605c2f48c137c7f8f77cc5192 authorMichael Terry <michael.terry@canonical.com> dateTue 19 Aug 2014, 11:25 (12 years ago) parentb3578c1
3 files changed+9−17
debian/control+1−1 plugins/AccountsService/AccountsService.cpp+8−8 plugins/AccountsService/com.canonical.unity.AccountsService.xml−8
debian/control+1−1
@@ -167,7 +167,7 @@ Package: unity8-private
167167Architecture: any
168168Multi-Arch: same
169169Pre-Depends: ${misc:Pre-Depends},
170−Depends: accountsservice-ubuntu-schemas,
170+Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
171171 gsettings-ubuntu-schemas,
172172 libhardware2,
173173 libunity-core-6.0-9,
plugins/AccountsService/AccountsService.cpp+8−8
@@ -104,7 +104,7 @@ void AccountsService::updateDemoEdges()
104104
105105void AccountsService::updateEnableLauncherWhileLocked()
106106{
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();
108108 if (m_enableLauncherWhileLocked != enableLauncherWhileLocked) {
109109 m_enableLauncherWhileLocked = enableLauncherWhileLocked;
110110 Q_EMIT enableLauncherWhileLockedChanged();
@@ -113,7 +113,7 @@ void AccountsService::updateEnableLauncherWhileLocked()
113113
114114void AccountsService::updateEnableIndicatorsWhileLocked()
115115{
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();
117117 if (m_enableIndicatorsWhileLocked != enableIndicatorsWhileLocked) {
118118 m_enableIndicatorsWhileLocked = enableIndicatorsWhileLocked;
119119 Q_EMIT enableIndicatorsWhileLockedChanged();
@@ -177,12 +177,6 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte
177177 if (changed.contains("demo-edges")) {
178178 updateDemoEdges();
179179 }
180− if (changed.contains("EnableLauncherWhileLocked")) {
181− updateEnableLauncherWhileLocked();
182− }
183− if (changed.contains("EnableIndicatorsWhileLocked")) {
184− updateEnableIndicatorsWhileLocked();
185− }
186180 } else if (interface == "com.canonical.unity.AccountsService.Private") {
187181 if (changed.contains("FailedLogins")) {
188182 updateFailedLogins();
@@ -195,6 +189,12 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte
195189 if (changed.contains("PasswordDisplayHint")) {
196190 updatePasswordDisplayHint();
197191 }
192+ if (changed.contains("EnableLauncherWhileLocked")) {
193+ updateEnableLauncherWhileLocked();
194+ }
195+ if (changed.contains("EnableIndicatorsWhileLocked")) {
196+ updateEnableIndicatorsWhileLocked();
197+ }
198198 }
199199}
200200
plugins/AccountsService/com.canonical.unity.AccountsService.xml−8
@@ -9,14 +9,6 @@
99 <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
1010 value="com.ubuntu.AccountsService.GreeterChangeAny"/>
1111
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−
2012 <!-- Should have been named DemoEdges, sorry folks. -mterry -->
2113 <property name="demo-edges" type="b" access="readwrite">
2214 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>