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

[Sam Spilsbury]

Remove redundant checks in Expo which could cause grid to be triggered in
expo. (LP: #1037142)

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
it's useless in a post 0.8 world.

.

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.

[jenkins (martin-mrazik+qa)]

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)

[Sam Spilsbury (smspillaz)]

CI appears to be 404ing

[Martin Mrazik (mrazik)]

> 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

[Daniel van Vugt (vanvugt)]

Resubmit per the prereq branch.

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

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

[Sam Spilsbury (smspillaz)]

review: Needs Resubmitting

[jenkins (martin-mrazik+qa)]

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)

[jenkins (martin-mrazik+qa)]

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

The prerequisite link points to a superseded branch, which is sure to cause Tarmac/Jenkins confusion.

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

It doesn't matter anyways, we're not having this in the next 3 hours ....

[jenkins (martin-mrazik+qa)]

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Superficial assessment:

Bug 1037142 is already fix released, so this branch should not be named *fix_1037142
The prerequisite branch is superseded, which the auto merger does not like.

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

> Superficial assessment:
>
> Bug 1037142 is already fix released, so this branch should not be named
> *fix_1037142

It fixes the bug properly. The last thing that went in which "fixed" the bug just avoided causing it by detecting the expo plugin was active and not allowing grid to fire. This fixes the real issue that was causing the problem.

I can split the bugs if you want, but they will be split on a functional analysis of the issues and not really a user analysis.

> The prerequisite branch is superseded, which the auto merger does not like.

This is not really a problem as we have to resubmit without the prereq before approving anyways.

[Sam Spilsbury (smspillaz)]

Resubmitted as above, note that this will fail jenkins due to a distro patch on the expo plugin, so that distro patch should first be refreshed before looking at this.

[jenkins (martin-mrazik+qa)]

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Please resubmit with the correct prerequisite branch name (lp:~compiz-team/compiz/compiz.fix_1053280)

So many "superseded" links to follow...

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

Ah sorry about that. That typo was hard to spot, I thought the prereq was already correct.

[jenkins (martin-mrazik+qa)]

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Works for me.

review: Approve

[jenkins (martin-mrazik+qa)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/7/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2012-09-05 17:15:39 +0000
+++ plugins/expo/src/expo.cpp	2012-10-11 10:12:24 +0000
@@ -46,10 +46,6 @@
 		     CompAction::State   state,
 		     CompOption::Vector& options)
 {
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
     if (expoMode)
     {
 	dndState = DnDStart;
@@ -67,10 +63,6 @@
 		     CompAction::State   state,
 		     CompOption::Vector& options)
 {
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
     if (dndState == DnDDuring || dndState == DnDStart)
     {
 	if (dndWindow)
@@ -93,10 +85,6 @@
 		    CompAction::State   state,
 		    CompOption::Vector& options)
 {
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
     if (screen->otherGrabExist ("expo", NULL))
 	return false;
 
@@ -139,10 +127,6 @@
 		      CompAction::State   state,
 		      CompOption::Vector& options)
 {
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid && xid != screen->root ())
-	return false;
-
     if (!expoMode)
 	return true;
 
@@ -175,10 +159,6 @@
 		      CompAction::State   state,
 		      CompOption::Vector& options)
 {
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
     if (!expoMode)
 	return false;
 
@@ -195,9 +175,6 @@
 		    CompOption::Vector& options)
 {
     unsigned int newX, newY;
-    Window       xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
 
     if (!expoMode)
 	return false;
@@ -226,9 +203,6 @@
 		    CompOption::Vector& options)
 {
     int newX, newY;
-    Window       xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
 
     if (!expoMode)
 	return false;