Merge lp://staging/~charlesk/indicator-datetime/always-get-initial-tzid-from-timedate1 into lp://staging/indicator-datetime/15.10
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Renato Araujo Oliveira Filho | ||||
Approved revision: | 448 | ||||
Merged at revision: | 442 | ||||
Proposed branch: | lp://staging/~charlesk/indicator-datetime/always-get-initial-tzid-from-timedate1 | ||||
Merge into: | lp://staging/indicator-datetime/15.10 | ||||
Diff against target: |
796 lines (+362/-266) 7 files modified
include/datetime/dbus-shared.h (+42/-0) include/datetime/timezone-timedated.h (+4/-4) include/datetime/timezones-live.h (+2/-3) src/main.cpp (+12/-2) src/timezone-timedated.cpp (+139/-135) src/timezones-live.cpp (+7/-4) tests/test-timezone-timedated.cpp (+156/-118) |
||||
To merge this branch: | bzr merge lp://staging/~charlesk/indicator-datetime/always-get-initial-tzid-from-timedate1 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Renato Araujo Oliveira Filho (community) | Approve | ||
Antti Kaijanmäki (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+291421@code.staging.launchpad.net |
Commit message
Fix possible startup timing issues when watching for a timezone from timedate1
Description of the change
Possible fix to bug #1567940, fixes a couple of bugs in the code that got tzid changes from org.freedesktop
1. Watch for timedate1 to show up on the bus, and query it when it does, so that there's no possible timing issue between indicator-
2. Use G_BUS_NAME_
3. Get the initial value by querying timedate1's properties instead of reading from /etc/timezone
4. If 'Timezone' shows up in timedate1's invalidated properties signal, again query for the value instead of reading /etc/timezone
PASSED: Continuous integration, rev:443 jenkins. qa.ubuntu. com/job/ indicator- datetime- ci/370/ jenkins. qa.ubuntu. com/job/ indicator- datetime- wily-amd64- ci/60 jenkins. qa.ubuntu. com/job/ indicator- datetime- wily-armhf- ci/60 jenkins. qa.ubuntu. com/job/ indicator- datetime- wily-armhf- ci/60/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/indicator- datetime- ci/370/ rebuild
http://