Compiz

Merge lp://qastaging/~compiz-team/compiz/compiz.expo.fix_1037142 into lp://qastaging/compiz/0.9.8

  1. compiz.expo.fix_1037142
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.expo.fix_1037142
Merge into: lp://qastaging/compiz/0.9.8
Diff against target: 1194 lines (+859/-95)
11 files modified
include/core/action.h (+12/-1)
include/core/option.h (+4/-2)
plugins/expo/src/expo.cpp (+0/-26)
src/action.cpp (+24/-0)
src/event.cpp (+149/-62)
src/eventmanagement.h (+80/-0)
src/option.cpp (+18/-0)
src/option/tests/option.cpp (+31/-0)
src/privateaction.h (+25/-1)
src/privatescreen/tests/test-privatescreen.cpp (+513/-1)
src/screen.cpp (+3/-2)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/compiz.expo.fix_1037142
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Needs Fixing
Sam Spilsbury Needs Resubmitting
Daniel van Vugt Pending
Review via email: mp+125982@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-09-22.

This proposal has been superseded by a proposal from 2012-09-24.

Description of the change

Remove redundant checks in Expo which could cause grid to be triggered in expo. We'd be checking for a condition that could never be true, as we pass noOptions () to expoTerm. Better just to not have that check at all, since its useless in a post 0.8 world.

Tested by the branch this one depends on.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3391
http://jenkins.qa.ubuntu.com/job/compiz-ci/94/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/94/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

CI appears to be 404ing

Revision history for this message
Martin Mrazik (mrazik) wrote : Posted in a previous version of this proposal

> CI appears to be 404ing

Sorry. That is a but that needs to be workarounded every now and then. Should work now. This is the relevant error:

patching file plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp
patching file plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt
patching file plugins/expo/src/windows_on_viewport/tests/test-windows-on-viewport.cpp
patching file plugins/expo/src/client-list-generator.h
patching file plugins/expo/src/viewport-member-window.h
Patch 100_expo_layout.patch does not apply (enforce with -f)
dh_quilt_patch: quilt --quiltrc /dev/null push -a || test $? = 2 returned exit code 1
make[1]: *** [override_dh_quilt_patch] Error 1
make[1]: Leaving directory `/tmp/buildd/compiz-0.9.8.2+bzr3377'
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2
E: Failed autobuilding of package

Revision history for this message
Daniel van Vugt (vanvugt) wrote : Posted in a previous version of this proposal

Resubmit per the prereq branch.

review: Needs Resubmitting
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Actually, it should just be possible to have the fix inside the grid plugin in Q for now and leave the rest for later (which "properly" fixes it). I've split up the branches in this case, and this one is marked resubmit because it depends on the tests.

review: Needs Resubmitting
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:3387
http://jenkins.qa.ubuntu.com/job/compiz-ci/102/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/102/console

review: Needs Fixing (continuous-integration)

Unmerged revisions

3387. By Sam Spilsbury

Merge lp:~compiz-team/compiz/compiz.fix_1053280

3386. By Sam Spilsbury

Remove redundant checks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches