GSettings Ubuntu touch schemas

Merge lp:~mterry/gsettings-ubuntu-touch-schemas/fix-strings into lp:gsettings-ubuntu-touch-schemas

  1. fix-strings
  2. Merge into trunk
Proposed by Michael Terry on 2016-04-05
Status: Merged
Approved by: Ken VanDine on 2016-04-05
Approved revision: 63
Merged at revision: 65
Proposed branch: lp:~mterry/gsettings-ubuntu-touch-schemas/fix-strings
Merge into: lp:gsettings-ubuntu-touch-schemas
Diff against target: 21 lines (+2/-2)
1 file modified
accountsservice/com.ubuntu.AccountsService.Input.xml (+2/-2)
To merge this branch: bzr merge lp:~mterry/gsettings-ubuntu-touch-schemas/fix-strings
Reviewer Review Type Date Requested Status
Ken VanDine 2016-04-05 Approve on 2016-04-05
Review via email: mp+291019@code.launchpad.net

Commit Message

Fix DefaultValue settings for MousePrimaryButton and TouchpadPrimaryButton.

Description of the Change

Fix DefaultValue settings for MousePrimaryButton and TouchpadPrimaryButton.

This isn't a visible bug yet, but this issue is being worked around in ubuntu-system-settings and should be addressed for correctness.

You can test the default value by calling (on a phone):

gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get com.ubuntu.AccountsService.Input MousePrimaryButton

To post a comment you must log in.
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'accountsservice/com.ubuntu.AccountsService.Input.xml'
2--- accountsservice/com.ubuntu.AccountsService.Input.xml 2016-01-21 16:36:40 +0000
3+++ accountsservice/com.ubuntu.AccountsService.Input.xml 2016-04-05 17:24:17 +0000
4@@ -8,7 +8,7 @@
5
6 <!-- "left" or "right" -->
7 <property name="MousePrimaryButton" type="s" access="readwrite">
8- <annotation name="org.freedesktop.Accounts.DefaultValue" value="left"/>
9+ <annotation name="org.freedesktop.Accounts.DefaultValue.String" value="left"/>
10 </property>
11
12 <!-- 0 to 1 -->
13@@ -28,7 +28,7 @@
14
15 <!-- "left" or "right" -->
16 <property name="TouchpadPrimaryButton" type="s" access="readwrite">
17- <annotation name="org.freedesktop.Accounts.DefaultValue" value="left"/>
18+ <annotation name="org.freedesktop.Accounts.DefaultValue.String" value="left"/>
19 </property>
20
21 <!-- 0 to 1 -->

Subscribers

People subscribed via source and target branches