Unity

Merge lp:~azzar1/unity/avoid-lambda-edgebarrier into lp:unity

  1. avoid-lambda-edgebarrier
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3981
Proposed branch: lp:~azzar1/unity/avoid-lambda-edgebarrier
Merge into: lp:unity
Diff against target: 42 lines (+9/-5)
2 files modified
launcher/EdgeBarrierController.cpp (+8/-5)
launcher/EdgeBarrierControllerPrivate.h (+1/-0)
To merge this branch: bzr merge lp:~azzar1/unity/avoid-lambda-edgebarrier
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Marco Trevisan (Treviño) Approve
Review via email: mp+260409@code.launchpad.net

Commit message

This likely could fix https://bugs.launchpad.net/ubuntu/+source/unity/+bug/1451613. At least the backtraces posted there suggest this. But I think that those backtraces are just leftovers of old crashes-on-unloading.

Description of the change

This likely could fix https://bugs.launchpad.net/ubuntu/+source/unity/+bug/1451613. At least the backtraces posted there suggest this. But I think that those backtraces are just leftovers of old crashes-on-unloading.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ok

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

FAILED: Continuous integration, rev:3965
http://jenkins.qa.ubuntu.com/job/unity-ci/1244/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/20
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/20/console

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/EdgeBarrierController.cpp'
2--- launcher/EdgeBarrierController.cpp 2015-01-15 15:02:24 +0000
3+++ launcher/EdgeBarrierController.cpp 2015-05-28 00:51:03 +0000
4@@ -94,11 +94,7 @@
5
6 uscreen->changed.connect(sigc::mem_fun(this, &EdgeBarrierController::Impl::OnUScreenChanged));
7
8- parent_->force_disable.changed.connect([this] (bool) {
9- auto monitors = UScreen::GetDefault()->GetMonitors();
10- ResizeBarrierList(monitors);
11- SetupBarriers(monitors);
12- });
13+ parent_->force_disable.changed.connect(sigc::mem_fun(this, &EdgeBarrierController::Impl::OnForceDisableChanged));
14
15 parent_->sticky_edges.SetGetterFunction([this] {
16 return parent_->options() ? parent_->options()->edge_resist() : false;
17@@ -136,6 +132,13 @@
18 SetupBarriers(layout);
19 }
20
21+void EdgeBarrierController::Impl::OnForceDisableChanged(bool value)
22+{
23+ auto monitors = UScreen::GetDefault()->GetMonitors();
24+ ResizeBarrierList(monitors);
25+ SetupBarriers(monitors);
26+}
27+
28 void EdgeBarrierController::Impl::OnOptionsChanged()
29 {
30 SetupBarriers(UScreen::GetDefault()->GetMonitors());
31
32=== modified file 'launcher/EdgeBarrierControllerPrivate.h'
33--- launcher/EdgeBarrierControllerPrivate.h 2014-12-12 22:33:24 +0000
34+++ launcher/EdgeBarrierControllerPrivate.h 2015-05-28 00:51:03 +0000
35@@ -42,6 +42,7 @@
36 void SetupBarriers(std::vector<nux::Geometry> const& layout);
37
38 void OnUScreenChanged(int primary, std::vector<nux::Geometry> const& layout);
39+ void OnForceDisableChanged(bool value);
40 void OnOptionsChanged();
41
42 void OnPointerBarrierEvent(PointerBarrierWrapper::Ptr const& owner, BarrierEvent::Ptr const& event);