Merge lp://qastaging/~3v1n0/compiz/ccp-core-options-save-fix into lp://qastaging/compiz/0.9.9
Proposed by
Marco Trevisan (Treviño)
| Status: | Merged |
|---|---|
| Approved by: | Martin Mrazik |
| Approved revision: | 3604 |
| Merged at revision: | 3603 |
| Proposed branch: | lp://qastaging/~3v1n0/compiz/ccp-core-options-save-fix |
| Merge into: | lp://qastaging/compiz/0.9.9 |
| Diff against target: |
43 lines (+16/-10) 1 file modified
plugins/ccp/src/ccp.cpp (+16/-10) |
| To merge this branch: | bzr merge lp://qastaging/~3v1n0/compiz/ccp-core-options-save-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Sam Spilsbury | Approve | ||
|
Review via email:
|
|||
Commit message
Ccp: check if an option has changed before calling the base class
Otherwise core options (that is called before) won't never be correctly updated on
setOptionForPlugin call
(LP: #1122228)
Description of the change
The compiz core is the first to be loaded, so when calling setOptionForPlugin in CCP plugin we are checking if a value has been changed before storing it. However this won't ever happen for core options, since we compare the same value.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Martin Mrazik (mrazik) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Yep this is fine for now.
Dunno if your latest revision also does CompPlugin *p = CompPlugin::find (), but it would be a useful way of reducing a bit of clutter.
Implementation wise, I would have just done bool equal = o->value () != v; Its a bit clearer than having if (o && something else) o = NULL; if (o).