Unity

Merge lp://staging/~3v1n0/unity/use-scaling-ubuntu-schemas-settings into lp://staging/unity

  1. use-scaling-ubuntu-schemas-settings
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 4260
Proposed branch: lp://staging/~3v1n0/unity/use-scaling-ubuntu-schemas-settings
Merge into: lp://staging/unity
Diff against target: 527 lines (+126/-159)
11 files modified
debian/control (+2/-1)
debian/unity.migrations (+1/-0)
tests/data/external.gschema.xml (+13/-0)
tests/test_em_converter.cpp (+7/-19)
tests/test_raw_pixel.cpp (+1/-2)
tools/migration-scripts/02_unity_setup_text_scale_factor (+3/-7)
tools/migration-scripts/04_unity_update_software_center_desktop_file (+7/-6)
tools/migration-scripts/05_unity_use_ubuntu_scaling_settings_schemas (+66/-0)
unity-shared/EMConverter.cpp (+8/-63)
unity-shared/EMConverter.h (+1/-16)
unity-shared/UnitySettings.cpp (+17/-45)
To merge this branch: bzr merge lp://staging/~3v1n0/unity/use-scaling-ubuntu-schemas-settings
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Needs Fixing
Andrea Azzarone (community) Approve
Review via email: mp+331667@code.staging.launchpad.net

Commit message

UnitySettings: use the ubuntu-schemas path for scaling settings

Also remove unused parts of EMConverter

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

+1

review: Approve
Revision history for this message
Andrea Azzarone (azzar1) wrote :

text-scaling is not correctly migrated doing an upgrade from Z to A using this ppa. But this improves the current behavior so +1 for me.

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

The change looks good to me code-wise, there are 2 things on this and other merge proposals to do:
- please file a bug to explain why we are migrating those values. This is so that the release team understands the bug fix and reference it in each package impacted.
- on this one, we have a migration script for the scaling factor. However, we have another migration script to reset the scaling factor for GNOME. It means that if we run the ubuntu session before switching to the unity one, we need to ensure about the order (and having the migration script moving the key before the Ubuntu one). Another way is to move the reset from the other script to that one, after you migrated the settings. Mind doing that change?

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.