Merge lp:~mc-return/compiz/compiz.fix1030473-part3 into lp:compiz/0.9.8
Proposed by
MC Return
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | 3307 |
Merged at revision: | 3304 |
Proposed branch: | lp:~mc-return/compiz/compiz.fix1030473-part3 |
Merge into: | lp:compiz/0.9.8 |
Diff against target: |
75 lines (+7/-8) 4 files modified
gtk/window-decorator/cairo.c (+2/-5) kde/window-decorator-kde4/switcher.cpp (+1/-1) libdecoration/decoration.c (+3/-1) plugins/opengl/src/screen.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~mc-return/compiz/compiz.fix1030473-part3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Approve | ||
Review via email: mp+118218@code.launchpad.net |
Commit message
Reduced the scope of the variable 'icccm_version', removed a break that can never be executed, added the variables 'frameType', 'frameState' and 'frameActions' to decor_quads_
Description of the change
Reduces the scope of the variable 'icccm_version', removes a break that can never be executed, adds the variables 'frameType', 'frameState' and 'frameActions' to decor_quads_
To post a comment you must log in.
8 - unsigned int nOffset = 1, frameType = 0, frameState = 0, frameActions = 0;
9 + unsigned int nOffset = 1, frameType, frameState, frameActions;
Are these guaranteed to be assigned to something we know later in the function? If so, we can move them there and declare and assign them at the same time.