Unity

Merge lp://staging/~azzar1/unity/lp-1217560 into lp://staging/unity

  1. lp-1217560
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Francis Ginther
Approved revision: no longer in the source branch.
Merged at revision: 3513
Proposed branch: lp://staging/~azzar1/unity/lp-1217560
Merge into: lp://staging/unity
Diff against target: 102 lines (+41/-4)
3 files modified
launcher/EdgeBarrierController.cpp (+14/-3)
launcher/EdgeBarrierControllerPrivate.h (+3/-1)
tests/test_edge_barrier_controller.cpp (+24/-0)
To merge this branch: bzr merge lp://staging/~azzar1/unity/lp-1217560
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+185994@code.staging.launchpad.net

Commit message

Derive EdgeBarrierController::Impl from sigc::trackable and remove the use of c++11 lambdas for callbacks.

Description of the change

== Problem ==
compiz crashed with SIGSEGV in std::function<bool>()

== Fix ==
Derive EdgeBarrierController::Impl from sigc::trackable and remove the use of c++11 lambdas for callbacks.

== Test ==
Unit tests addeded.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3509
http://jenkins.qa.ubuntu.com/job/unity-ci/364/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/253
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/251/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/252

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/364/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Using an unity::connection::Wrapper was ok as well, but this is fair enough.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/278/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/2236/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/234/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/234/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/234/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/281/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2259
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/237/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/237

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/285/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2275
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/241
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/241/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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.