Compiz

Merge lp://qastaging/~compiz-team/compiz/raring.fix_1138517 into lp://qastaging/compiz/raring

raring.fix_1138517
Merge into raring

Proposed by Sam Spilsbury on 2013-03-11

Status:

Merged

Approved by:

Timo Jyrinki on 2013-03-13

Approved revision:

3635

Merged at revision:

3635

Proposed branch:

lp://qastaging/~compiz-team/compiz/raring.fix_1138517

Merge into:

lp://qastaging/compiz/raring

Diff against target:

409 lines (+227/-45)

4 files modified

plugins/decor/src/decor.cpp (+38/-22)
src/privatewindow.h (+2/-2)
src/window.cpp (+27/-10)
tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp (+160/-11)

To merge this branch:

bzr merge lp://qastaging/~compiz-team/compiz/raring.fix_1138517

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2013-03-11	Approve on 2013-03-13
Timo Jyrinki		2013-03-11	Approve on 2013-03-13
Andrea Azzarone			Approve on 2013-03-12
Review via email: mp+152622@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2013-03-06.

Commit message

Don't set lastFrameExtents unless the window geometry actually changed - as
that variable only exists to track changes in the actual geometry of
the window and not the apparant frame extents.

Added tests to verify that behaviour.

(LP: #1138517)

Description of the change

Don't set lastFrameExtents unless the window geometry actually changed - as
that variable only exists to track changes in the actual geometry of
the window and not the apparant frame extents.

Added tests to verify that behaviour.

(LP: #1138517)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-06: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3633
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~compiz-team/compiz/raring.fix_1138517/+merge/151940/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/compiz-ci/106/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/143/console
SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/495/console