Merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/false-duplicate-1560494 into lp://qastaging/ubuntu-system-settings-online-accounts
Proposed by
Alberto Mardegan
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | David Barth | ||||
| Approved revision: | 341 | ||||
| Merged at revision: | 341 | ||||
| Proposed branch: | lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/false-duplicate-1560494 | ||||
| Merge into: | lp://qastaging/ubuntu-system-settings-online-accounts | ||||
| Diff against target: |
12 lines (+1/-1) 1 file modified
plugins/module/OAuth.qml (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/false-duplicate-1560494 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Online Accounts | Pending | ||
|
Review via email:
|
|||
Commit message
Fix false positive in duplicate account detection
The AccountServiceModel has an "account" property which shadows the global variable with the same name. We should use "__account" here, which was introduced to fix a similar issue on another part of the code.
Description of the change
Fix false positive in duplicate account detection
The AccountServiceModel has an "account" property which shadows the global variable with the same name. We should use "__account" here, which was introduced to fix a similar issue on another part of the code.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
