git.iko.soy/unity8
on xenial help sign in
Clean up accountsservice property definitions
commit27f79e87d8c04119c2c627ab804170bd8a26d431 authorMichael Terry <michael.terry@canonical.com> dateTue 29 Jul 2014, 17:18 (12 years ago) parent3955a4b
6 files changed+6−48
compare with xenial
unifiedsplit
debian/control+2−1 debian/unity8-private.install−2 plugins/AccountsService/50-com.canonical.unity.AccountsService.pkla−6 plugins/AccountsService/CMakeLists.txt−10 plugins/AccountsService/com.canonical.unity.AccountsService.policy−24 plugins/AccountsService/com.canonical.unity.AccountsService.xml+4−5
debian/control+2−1
@@ -166,7 +166,8 @@ Package: unity8-private
166166Architecture: any
167167Multi-Arch: same
168168Pre-Depends: ${misc:Pre-Depends},
169−Depends: gsettings-ubuntu-schemas,
169+Depends: accountsservice-ubuntu-schemas,
170+ gsettings-ubuntu-schemas,
170171 libhardware2,
171172 libunity-core-6.0-9,
172173 pay-service,
debian/unity8-private.install−2
@@ -10,5 +10,3 @@ usr/lib/*/unity8/qml/Unity
1010usr/lib/*/unity8/qml/Utils
1111usr/share/accountsservice/interfaces
1212usr/share/dbus-1/interfaces
13−usr/share/polkit-1
14−var/lib/polkit-1
plugins/AccountsService/50-com.canonical.unity.AccountsService.pkladeleted−6
@@ -1,6 +0,0 @@
1−[Allow LightDM to set Unity AccountsService fields]
2−Identity=unix-user:lightdm
3−Action=com.canonical.unity.AccountsService.ModifyAnyUser
4−ResultActive=yes
5−ResultInactive=yes
6−ResultAny=yes
plugins/AccountsService/CMakeLists.txt−10
@@ -10,8 +10,6 @@ qt5_use_modules(AccountsService-qml DBus Qml)
1010
1111add_unity8_plugin(AccountsService 0.1 AccountsService TARGETS AccountsService-qml)
1212
13−set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
14−set(POLKIT_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1")
1513set(DBUS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces")
1614set(ACCOUNTS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/accountsservice/interfaces")
1715
@@ -24,11 +22,3 @@ install(CODE "
2422execute_process(COMMAND mkdir -p \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
2523execute_process(COMMAND ln -sf ../../dbus-1/interfaces/com.canonical.unity.AccountsService.xml \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
2624 ")
27−
28−install(FILES com.canonical.unity.AccountsService.policy
29− DESTINATION "${POLKIT_DATA_DIR}/actions"
30− )
31−
32−install(FILES 50-com.canonical.unity.AccountsService.pkla
33− DESTINATION "${POLKIT_LIB_DIR}/localauthority/10-vendor.d"
34− )
plugins/AccountsService/com.canonical.unity.AccountsService.policydeleted−24
@@ -1,24 +0,0 @@
1−<?xml version="1.0" encoding="UTF-8"?>
2−
3−<policyconfig>
4− <action id="com.canonical.unity.AccountsService.ModifyOwnUser">
5− <description>Set properties of own user</description>
6− <message>Authentication is required to set one's own unity properties.</message>
7− <defaults>
8− <allow_any>yes</allow_any>
9− <allow_inactive>yes</allow_inactive>
10− <allow_active>yes</allow_active>
11− </defaults>
12− </action>
13−
14− <action id="com.canonical.unity.AccountsService.ModifyAnyUser">
15− <description>Set properties of any user</description>
16− <message>Authentication is required to set another user's unity
17−properties.</message>
18− <defaults>
19− <allow_any>no</allow_any>
20− <allow_inactive>no</allow_inactive>
21− <allow_active>no</allow_active>
22− </defaults>
23− </action>
24−</policyconfig>
plugins/AccountsService/com.canonical.unity.AccountsService.xml+4−5
@@ -3,19 +3,18 @@
33
44 <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
55
6− <annotation name="org.freedesktop.Accounts.Authentication.ChangeOwn"
7− value="com.canonical.unity.AccountsService.ModifyOwnUser"/>
8−
96 <annotation name="org.freedesktop.Accounts.Authentication.ReadAny"
10− value="com.canonical.unity.AccountsService.ModifyAnyUser"/>
7+ value="com.ubuntu.AccountsService.GreeterReadAny"/>
118
129 <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
13− value="com.canonical.unity.AccountsService.ModifyAnyUser"/>
10+ value="com.ubuntu.AccountsService.GreeterChangeAny"/>
1411
12+ <!-- Should have been named DemoEdges, sorry folks. -mterry -->
1513 <property name="demo-edges" type="b" access="readwrite">
1614 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
1715 </property>
1816
17+ <!-- Should have been named LauncherItems, sorry folks. -mterry -->
1918 <property name="launcher-items" type="aa{sv}" access="readwrite">
2019 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
2120 </property>